cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf-fediz git commit: Updating Tomcat8
Date Wed, 30 Aug 2017 14:33:41 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.4.x-fixes d6266d9dc -> 186939536


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/18693953
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/18693953
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/18693953

Branch: refs/heads/1.4.x-fixes
Commit: 1869395363599eeebaa1c924292be6bfc6604857
Parents: d6266d9
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Aug 30 15:19:13 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Aug 30 15:33:34 2017 +0100

----------------------------------------------------------------------
 pom.xml                                                   |  4 ++--
 .../cxf/fediz/systests/custom/CustomParametersTest.java   |  2 +-
 .../fediz/integrationtests/federation/FederationTest.java |  4 ++--
 .../apache/cxf/fediz/integrationtests/SAMLSSOTest.java    |  2 +-
 .../cxf/fediz/systests/federation/unknown/WSFedTest.java  | 10 +++++-----
 .../org/apache/cxf/fediz/integrationtests/WSFedTest.java  |  2 +-
 .../java/org/apache/cxf/fediz/systests/idp/IdpTest.java   |  2 +-
 .../ClientCertificatePreAuthSpringTest.java               |  2 +-
 .../cxf/fediz/integrationtests/ClientCertificateTest.java |  2 +-
 .../fediz/integrationtests/JettyPreAuthSpringTest.java    |  2 +-
 .../org/apache/cxf/fediz/integrationtests/JettyTest.java  |  2 +-
 .../apache/cxf/fediz/integrationtests/KerberosTest.java   |  6 +++---
 .../org/apache/cxf/fediz/integrationtests/LDAPTest.java   |  2 +-
 .../java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java |  6 +++---
 .../java/org/apache/cxf/fediz/systests/idp/IdpTest.java   |  2 +-
 .../apache/cxf/fediz/integrationtests/Spring3Test.java    |  2 +-
 .../org/apache/cxf/fediz/integrationtests/SpringTest.java |  2 +-
 .../fediz/integrationtests/AudienceRestrictionTest.java   |  2 +-
 .../cxf/fediz/integrationtests/ClientCertificateTest.java |  2 +-
 .../cxf/fediz/integrationtests/HolderOfKeyTest.java       |  2 +-
 .../org/apache/cxf/fediz/integrationtests/TomcatTest.java |  2 +-
 .../org/apache/cxf/fediz/integrationtests/WReqTest.java   |  2 +-
 22 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18693953/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c1ab73d..eb18bcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
         <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>
-        <tomcat7.version>7.0.75</tomcat7.version>
-        <tomcat8.version>8.5.12</tomcat8.version>
+        <tomcat7.version>7.0.81</tomcat7.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/18693953/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 af18315..307c4b2 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
@@ -102,7 +102,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/18693953/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
----------------------------------------------------------------------
diff --git a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
b/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
index 3ab3875..e250a54 100644
--- a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
+++ b/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java
@@ -76,7 +76,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");
@@ -112,7 +112,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/18693953/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
index a34b2fc..710ea15 100644
--- a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
+++ b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
@@ -124,7 +124,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/18693953/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 2be2225..2916c7f 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 {
@@ -113,7 +113,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");
@@ -188,7 +188,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";
@@ -196,7 +196,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);
 
@@ -258,7 +258,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/18693953/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/integrationtests/WSFedTest.java
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/integrationtests/WSFedTest.java
b/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/integrationtests/WSFedTest.java
index ad5a097..6ac1860 100644
--- a/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/integrationtests/WSFedTest.java
+++ b/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/integrationtests/WSFedTest.java
@@ -134,7 +134,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/18693953/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 a133c9b..bc0ef7a 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
@@ -105,7 +105,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/18693953/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificatePreAuthSpringTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificatePreAuthSpringTest.java
b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificatePreAuthSpringTest.java
index 8454775..035a346 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificatePreAuthSpringTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificatePreAuthSpringTest.java
@@ -111,7 +111,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/18693953/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
index d4f66b1..ed8b0fc 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
@@ -111,7 +111,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/18693953/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
index ab19290..8d04913 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyPreAuthSpringTest.java
@@ -93,7 +93,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/18693953/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
index 5c7adee..20a13e6 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/integrationtests/JettyTest.java
@@ -93,7 +93,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/18693953/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
index 1a20ae7..31c9d50 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/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
@@ -86,7 +86,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();
@@ -139,7 +139,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/18693953/systests/ldap/src/test/java/org/apache/cxf/fediz/integrationtests/LDAPTest.java
----------------------------------------------------------------------
diff --git a/systests/ldap/src/test/java/org/apache/cxf/fediz/integrationtests/LDAPTest.java
b/systests/ldap/src/test/java/org/apache/cxf/fediz/integrationtests/LDAPTest.java
index f090590..ac0347a 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/fediz/integrationtests/LDAPTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/fediz/integrationtests/LDAPTest.java
@@ -175,7 +175,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/18693953/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 b9f9291..2ea4b63 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
@@ -135,7 +135,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");
@@ -973,8 +973,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/18693953/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
----------------------------------------------------------------------
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index 5358318..9681571 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -138,7 +138,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/18693953/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring3Test.java
----------------------------------------------------------------------
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring3Test.java
b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring3Test.java
index 013628e..facc3e8 100644
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring3Test.java
+++ b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring3Test.java
@@ -101,7 +101,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/18693953/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
----------------------------------------------------------------------
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
index db09cde..86f2cbc 100644
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
+++ b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
@@ -100,7 +100,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/18693953/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
index efcecbf..7627438 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/AudienceRestrictionTest.java
@@ -97,7 +97,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/18693953/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
index a2c5a6b..be205d5 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/ClientCertificateTest.java
@@ -89,7 +89,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/18693953/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/HolderOfKeyTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/HolderOfKeyTest.java
b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/HolderOfKeyTest.java
index 2abb4b4..12e02b7 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/HolderOfKeyTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/HolderOfKeyTest.java
@@ -99,7 +99,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/18693953/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
index 66acdc0..7e2a2d9 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/TomcatTest.java
@@ -86,7 +86,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/18693953/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/WReqTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/WReqTest.java
b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/WReqTest.java
index 7bea676..e3915c2 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/WReqTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/integrationtests/WReqTest.java
@@ -99,7 +99,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");


Mime
View raw message