Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7AF01182C4 for ; Wed, 24 Feb 2016 12:08:44 +0000 (UTC) Received: (qmail 69845 invoked by uid 500); 24 Feb 2016 12:08:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 69665 invoked by uid 500); 24 Feb 2016 12:08:44 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 69649 invoked by uid 99); 24 Feb 2016 12:08:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2016 12:08:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 376C2E8EAF; Wed, 24 Feb 2016 12:08:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Wed, 24 Feb 2016 12:08:45 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf-fediz git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf-fediz Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf-fediz Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/47a23b88 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/47a23b88 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/47a23b88 Branch: refs/heads/master Commit: 47a23b88cd39386ca1fb9d1fa40ba04cd73ef331 Parents: 2433941 72f0c93 Author: Sergey Beryozkin Authored: Wed Feb 24 12:08:27 2016 +0000 Committer: Sergey Beryozkin Committed: Wed Feb 24 12:08:27 2016 +0000 ---------------------------------------------------------------------- pom.xml | 6 +- services/idp/pom.xml | 6 +- .../idp/beans/SigninParametersCacheAction.java | 57 ++- .../TrustedIdpOIDCProtocolHandler.java | 411 +++++++++++++++ .../TrustedIdpSAMLProtocolHandler.java | 1 - .../TrustedIdpWSFedProtocolHandler.java | 4 +- .../flows/federation-signin-response.xml | 6 +- .../flows/federation-validate-request.xml | 17 +- systests/federation/oidc/pom.xml | 287 +++++++++++ .../cxf/fediz/integrationtests/OIDCTest.java | 321 ++++++++++++ .../oidc/src/test/resources/client.jks | Bin 0 -> 2061 bytes .../oidc/src/test/resources/clienttrust.jks | Bin 0 -> 1512 bytes .../oidc/src/test/resources/entities-realma.xml | 500 +++++++++++++++++++ .../src/test/resources/fediz_config_oidc.xml | 56 +++ .../oidc/src/test/resources/realmb.cert | 3 + .../oidc/src/test/resources/server.jks | Bin 0 -> 3859 bytes systests/kerberos/pom.xml | 4 +- 17 files changed, 1643 insertions(+), 36 deletions(-) ----------------------------------------------------------------------