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: Fixing build with JDK7
Date Wed, 20 Jul 2016 09:39:35 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 3dfe0c161 -> 002c4c19d


Fixing build with JDK7


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/002c4c19
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/002c4c19
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/002c4c19

Branch: refs/heads/master
Commit: 002c4c19d464bdb196f28c8d062a2502e643fd9e
Parents: 3dfe0c1
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Jul 20 10:39:16 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Jul 20 10:39:16 2016 +0100

----------------------------------------------------------------------
 systests/jetty8/pom.xml                         | 12 ++++++++++
 .../AbstractClientCertTests.java                |  6 ++---
 .../fediz/integrationtests/AbstractTests.java   | 24 ++++++++++----------
 .../fediz/integrationtests/HTTPTestUtils.java   | 10 ++++----
 4 files changed, 32 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/002c4c19/systests/jetty8/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jetty8/pom.xml b/systests/jetty8/pom.xml
index bec84f1..017fd81 100644
--- a/systests/jetty8/pom.xml
+++ b/systests/jetty8/pom.xml
@@ -32,6 +32,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <htmlunit.jetty8.version>2.15</htmlunit.jetty8.version>
     </properties>
     <dependencies>
         <dependency>
@@ -81,6 +82,12 @@
             <type>test-jar</type>
             <scope>test</scope>
             <classifier>tests</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.sourceforge.htmlunit</groupId>
+                    <artifactId>htmlunit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -94,6 +101,11 @@
             <version>${hsqldb.version}</version>
             <scope>test</scope>
         </dependency>        
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>${htmlunit.jetty8.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <testResources>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/002c4c19/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
index f0431b8..e8edc88 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
@@ -109,7 +109,7 @@ public abstract class AbstractClientCertTests {
         Assert.assertTrue("User " + user + " claim " + claim + " is not 'alice@realma.org'",
                           bodyTextContent.contains(claim + "=alice@realma.org"));
         
-        webClient.close();
+        // webClient.close();
     }
     
     @org.junit.Test
@@ -148,7 +148,7 @@ public abstract class AbstractClientCertTests {
         Assert.assertTrue(wctx != null && wtrealm != null);
         Assert.assertTrue(wresult != null 
             && wresult.contains("urn:oasis:names:tc:SAML:2.0:cm:holder-of-key"));
-        webClient.close();
+        // webClient.close();
         
         // Now invoke on the RP using the saved parameters above, but a different client
cert!
         final WebClient webClient2 = new WebClient();
@@ -175,7 +175,7 @@ public abstract class AbstractClientCertTests {
                               || ex.getMessage().contains("403 Forbidden"));
         }
 
-        webClient2.close();
+        // webClient2.close();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/002c4c19/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
index c9245e4..547115e 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
@@ -354,7 +354,7 @@ public abstract class AbstractTests {
 
         Assert.assertTrue(signature.checkSignatureValue(ki.getX509Certificate()));
 
-        webClient.close();
+        // webClient.close();
     }
 
     @Test
@@ -390,7 +390,7 @@ public abstract class AbstractTests {
         String rpUrl = "https://localhost:" + getRpHttpsPort() + "/" + getServletContextName()
             + "/secure/fedservlet";
 
-        webClient.close();
+        // webClient.close();
         webClient = new WebClient();
         webClient.setCookieManager(cookieManager);
         webClient.getOptions().setUseInsecureSSL(true);
@@ -399,7 +399,7 @@ public abstract class AbstractTests {
 
         Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
 
-        webClient.close();
+        // webClient.close();
     }
 
     @Test
@@ -435,7 +435,7 @@ public abstract class AbstractTests {
         String rpUrl = "https://localhost:" + getRpHttpsPort() + "/" + getServletContextName()
             + "/secure/fedservlet";
 
-        webClient.close();
+        // webClient.close();
         webClient = new WebClient();
         webClient.setCookieManager(cookieManager);
         webClient.getOptions().setUseInsecureSSL(true);
@@ -444,7 +444,7 @@ public abstract class AbstractTests {
 
         Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
 
-        webClient.close();
+        // webClient.close();
     }
 
     @Test
@@ -480,7 +480,7 @@ public abstract class AbstractTests {
         String rpUrl = "https://localhost:" + getRpHttpsPort() + "/" + getServletContextName()
             + "/secure/fedservlet";
 
-        webClient.close();
+        // webClient.close();
         webClient = new WebClient();
         webClient.setCookieManager(cookieManager);
         webClient.getOptions().setUseInsecureSSL(true);
@@ -489,7 +489,7 @@ public abstract class AbstractTests {
 
         Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
 
-        webClient.close();
+        // webClient.close();
     }
 
     @Test
@@ -540,7 +540,7 @@ public abstract class AbstractTests {
                               || ex.getMessage().contains("403 Forbidden"));
         }
 
-        webClient.close();
+        // webClient.close();
     }
 
     @Test
@@ -587,7 +587,7 @@ public abstract class AbstractTests {
 
         Assert.assertTrue("Unexpected content of RP page", bodyTextContent2.contains("Secure
Test"));
 
-        webClient.close();
+        // webClient.close();
     }
 
     @org.junit.Test
@@ -617,7 +617,7 @@ public abstract class AbstractTests {
         idpUrl += "?wa=wsignin1.0&wreply=" + URLEncoder.encode(maliciousURL, "UTF-8");
         idpUrl += "&wtrealm=urn%3Aorg%3Aapache%3Acxf%3Afediz%3Afedizhelloworld";
         idpUrl += "&whr=urn%3Aorg%3Aapache%3Acxf%3Afediz%3Aidp%3Arealm-A";
-        webClient.close();
+        // webClient.close();
 
         final WebClient webClient2 = new WebClient();
         webClient2.setCookieManager(cookieManager);
@@ -633,7 +633,7 @@ public abstract class AbstractTests {
         } catch (FailingHttpStatusCodeException ex) {
             Assert.assertEquals(ex.getStatusCode(), 400);
         }
-        webClient2.close();
+        // webClient2.close();
     }
     
     @Test
@@ -688,7 +688,7 @@ public abstract class AbstractTests {
                               || ex.getMessage().contains("403 Forbidden"));
         }
 
-        webClient.close();
+        // webClient.close();
     }
     
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/002c4c19/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
index f69a088..921e97f 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
@@ -61,7 +61,7 @@ public final class HTTPTestUtils {
         Assert.assertTrue("WS Federation Systests Examples".equals(rpPage.getTitleText())
                             || "WS Federation Systests Spring Examples".equals(rpPage.getTitleText()));
 
-        webClient.close();
+        // webClient.close();
         return rpPage.getBody().getTextContent();
     }
     
@@ -75,7 +75,7 @@ public final class HTTPTestUtils {
         webClient.getOptions().setJavaScriptEnabled(false);
         final HtmlPage rpPage = webClient.getPage(url);
 
-        webClient.close();
+        // webClient.close();
         return rpPage.getBody().getTextContent();
     }
     
@@ -100,7 +100,7 @@ public final class HTTPTestUtils {
         Assert.assertTrue("WS Federation Systests Examples".equals(rpPage.getTitleText())
                           || "WS Federation Systests Spring Examples".equals(rpPage.getTitleText()));
 
-        webClient.close();
+        // webClient.close();
         return rpPage.getBody().getTextContent();
     }
     
@@ -126,7 +126,7 @@ public final class HTTPTestUtils {
             webClient.getPage(imgSrc);
         }
         
-        webClient.close();
+        // webClient.close();
     }
     
     public static void logoutCleanup(String url, CookieManager cookieManager) throws IOException
{
@@ -149,7 +149,7 @@ public final class HTTPTestUtils {
             webClient.getPage(imgSrc);
         }
         
-        webClient.close();
+        // webClient.close();
     }
 
 }


Mime
View raw message