cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf-fediz git commit: Updating some dependencies
Date Wed, 27 Apr 2016 10:51:32 GMT
Updating some dependencies


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

Branch: refs/heads/master
Commit: a7a509868d9a9dc0b3b1cdf59ac3881b2c39a245
Parents: 88d3071
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Apr 27 11:49:21 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Apr 27 11:49:21 2016 +0100

----------------------------------------------------------------------
 pom.xml                                         | 14 ++++-----
 services/oidc/pom.xml                           |  2 +-
 .../cxf/fediz/integrationtests/OIDCTest.java    | 31 ++++++++------------
 3 files changed, 21 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a7a50986/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f411e5..231068e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,11 +47,11 @@
         <cxf.version>3.1.7-SNAPSHOT</cxf.version>
         <cxf.build-utils.version>3.2.0</cxf.build-utils.version>
         <easymock.version>3.4</easymock.version>
-        <ecj.version>4.4.2</ecj.version>
+        <ecj.version>4.5.1</ecj.version>
         <ehcache.version>2.9.0</ehcache.version>
         <httpclient.version>4.3.5</httpclient.version>
         <hsqldb.version>2.3.3</hsqldb.version>
-        <htmlunit.version>2.19</htmlunit.version>
+        <htmlunit.version>2.21</htmlunit.version>
         <javassist.version>3.16.1-GA</javassist.version>
         <javax.el.version>2.2</javax.el.version>
         <javax.validation.version>1.1.0.Final</javax.validation.version>
@@ -60,14 +60,14 @@
         <jetty9.version>9.3.7.v20160115</jetty9.version>
         <junit.version>4.12</junit.version>
         <log4j.version>1.2.17</log4j.version>
-        <ognl.version>3.1.2</ognl.version>
-        <openjpa.version>2.4.0</openjpa.version>
+        <ognl.version>3.1.4</ognl.version>
+        <openjpa.version>2.4.1</openjpa.version>
         <servlet.version>2.5</servlet.version>
-        <slf4j.version>1.7.19</slf4j.version>
+        <slf4j.version>1.7.21</slf4j.version>
         <spring.version>4.1.9.RELEASE</spring.version>
         <spring.security.version>3.2.9.RELEASE</spring.security.version>
-        <tomcat7.version>7.0.68</tomcat7.version>
-        <tomcat8.version>8.0.32</tomcat8.version>
+        <tomcat7.version>7.0.69</tomcat7.version>
+        <tomcat8.version>8.0.33</tomcat8.version>
         <wss4j.version>2.1.5</wss4j.version>
         <xalan.version>2.7.2</xalan.version>
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a7a50986/services/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index 5374499..a0f9cca 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a7a50986/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
----------------------------------------------------------------------
diff --git a/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
b/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
index 4110355..ec8b7e8 100644
--- a/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
+++ b/systests/federation/oidc/src/test/java/org/apache/cxf/fediz/integrationtests/OIDCTest.java
@@ -27,8 +27,6 @@ import java.util.ArrayList;
 
 import javax.servlet.ServletException;
 
-import org.w3c.dom.Element;
-
 import com.gargoylesoftware.htmlunit.CookieManager;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -37,7 +35,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
-import com.gargoylesoftware.htmlunit.xml.XmlPage;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
@@ -237,24 +234,22 @@ public class OIDCTest {
         webClient.getOptions().setJavaScriptEnabled(false);
         
         // The decision page is returned as XML for some reason. So parse it and send a form
response back.
-        XmlPage oidcIdpConfirmationPage = webClient.getPage(url);
-        
-        Element clientId = (Element)oidcIdpConfirmationPage.getByXPath("//clientId").get(0);
-        Element redirectUri = (Element)oidcIdpConfirmationPage.getByXPath("//redirectUri").get(0);
-        Element scope = (Element)oidcIdpConfirmationPage.getByXPath("//proposedScope").get(0);
-        Element state = (Element)oidcIdpConfirmationPage.getByXPath("//state").get(0);
-        Element authenticityToken = (Element)oidcIdpConfirmationPage.getByXPath("//authenticityToken").get(0);
-        Element replyTo = (Element)oidcIdpConfirmationPage.getByXPath("//replyTo").get(0);
+        HtmlPage oidcIdpConfirmationPage = webClient.getPage(url);
+        final HtmlForm oidcForm = oidcIdpConfirmationPage.getForms().get(0);
         
-        WebRequest request = new WebRequest(new URL(replyTo.getTextContent()), HttpMethod.POST);
+        WebRequest request = new WebRequest(new URL(oidcForm.getActionAttribute()), HttpMethod.POST);
 
         request.setRequestParameters(new ArrayList<NameValuePair>());
-        request.getRequestParameters().add(new NameValuePair("client_id", clientId.getTextContent()));
-        request.getRequestParameters().add(new NameValuePair("redirect_uri", redirectUri.getTextContent()));
-        request.getRequestParameters().add(new NameValuePair("scope", scope.getTextContent()));
-        request.getRequestParameters().add(new NameValuePair("state", state.getTextContent()));
-        request.getRequestParameters().add(new NameValuePair("session_authenticity_token",

-                                                             authenticityToken.getTextContent()));
+        String clientId = oidcForm.getInputByName("client_id").getValueAttribute();
+        request.getRequestParameters().add(new NameValuePair("client_id", clientId));
+        String redirectUri = oidcForm.getInputByName("redirect_uri").getValueAttribute();
+        request.getRequestParameters().add(new NameValuePair("redirect_uri", redirectUri));
+        String scope = oidcForm.getInputByName("scope").getValueAttribute();
+        request.getRequestParameters().add(new NameValuePair("scope", scope));
+        String state = oidcForm.getInputByName("state").getValueAttribute();
+        request.getRequestParameters().add(new NameValuePair("state", state));
+        String authToken = oidcForm.getInputByName("session_authenticity_token").getValueAttribute();
+        request.getRequestParameters().add(new NameValuePair("session_authenticity_token",
authToken));
         request.getRequestParameters().add(new NameValuePair("oauthDecision", "allow"));
 
         HtmlPage idpPage = webClient.getPage(request);


Mime
View raw message