Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7A979200C1A for ; Mon, 13 Feb 2017 12:36:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 791F7160B75; Mon, 13 Feb 2017 11:36:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9D246160B4D for ; Mon, 13 Feb 2017 12:36:18 +0100 (CET) Received: (qmail 86381 invoked by uid 500); 13 Feb 2017 11:36:17 -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 86370 invoked by uid 99); 13 Feb 2017 11:36:17 -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; Mon, 13 Feb 2017 11:36:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A0E17DFC31; Mon, 13 Feb 2017 11:36:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Mon, 13 Feb 2017 11:36:17 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/18] cxf-fediz git commit: Whitespace cleanup archived-at: Mon, 13 Feb 2017 11:36:19 -0000 Repository: cxf-fediz Updated Branches: refs/heads/master 29bf8de22 -> 2ca318630 http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/systests/webapps/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java ---------------------------------------------------------------------- diff --git a/systests/webapps/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/systests/webapps/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java index 5d90f9c..3746936 100644 --- a/systests/webapps/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java +++ b/systests/webapps/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java @@ -44,7 +44,7 @@ import org.springframework.security.context.SecurityContextHolder; public class FederationServlet extends HttpServlet { /** - * + * */ private static final long serialVersionUID = -9019993850246851112L; @@ -68,11 +68,11 @@ public class FederationServlet extends HttpServlet { // Access Spring security context Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - + if (auth instanceof FederationAuthenticationToken) { FederationAuthenticationToken fedToken = (FederationAuthenticationToken)auth; List roleListToCheck = Arrays.asList("Admin", "Manager", "User", "Authenticated"); - + for (String item : roleListToCheck) { boolean found = false; for (GrantedAuthority ga : fedToken.getAuthorities()) { @@ -83,26 +83,26 @@ public class FederationServlet extends HttpServlet { } out.println("

role:" + item + "=" + (found ? "true" : "false") + "

"); } - + ClaimCollection claims = fedToken.getClaims(); for (Claim c : claims) { out.println("

" + c.getClaimType().toString() + "=" + c.getValue() + "

"); } - + Element el = fedToken.getLoginToken(); if (el != null) { out.println("loginToken=FOUND{FedizPrincipal}

"); } - + el = SecurityTokenThreadLocal.getToken(); if (el != null) { out.println("loginToken=FOUND{SecurityTokenThreadLocal}

"); } - + } - + out.println(""); - + } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java ---------------------------------------------------------------------- diff --git a/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java index d23281c..1d2cc7a 100644 --- a/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java +++ b/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java @@ -44,7 +44,7 @@ import org.springframework.util.Assert; public class FederationServlet extends HttpServlet { /** - * + * */ private static final long serialVersionUID = -9019993850246851112L; @@ -78,31 +78,31 @@ public class FederationServlet extends HttpServlet { for (Claim c : claims) { out.println("

" + c.getClaimType().toString() + "=" + c.getValue() + "

"); } - + Element el = fp.getLoginToken(); if (el != null) { out.println("loginToken=FOUND{FedizPrincipal}

"); } - + el = SecurityTokenThreadLocal.getToken(); if (el != null) { out.println("loginToken=FOUND{SecurityTokenThreadLocal}

"); } } - + out.println(""); - + // Access Spring security context Assert.notNull(SecurityContextHolder.getContext().getAuthentication(), "SecurityContextHolder Authentication not null"); - + Authentication obj = SecurityContextHolder.getContext().getAuthentication(); System.out.println("getCredentials: " + obj.getCredentials().toString()); System.out.println("getDetails: " + obj.getDetails().toString()); System.out.println("getName: " + obj.getName().toString()); System.out.println("getAuthorities: " + obj.getAuthorities().toString()); System.out.println("getPrincipal: " + obj.getPrincipal().toString()); - + } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java ---------------------------------------------------------------------- diff --git a/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java index df0ce26..c846ca3 100644 --- a/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java +++ b/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java @@ -44,7 +44,7 @@ import org.springframework.security.core.context.SecurityContextHolder; public class FederationServlet extends HttpServlet { /** - * + * */ private static final long serialVersionUID = -9019993850246851112L; @@ -68,11 +68,11 @@ public class FederationServlet extends HttpServlet { // Access Spring security context Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - + if (auth instanceof FederationAuthenticationToken) { FederationAuthenticationToken fedToken = (FederationAuthenticationToken)auth; List roleListToCheck = Arrays.asList("Admin", "Manager", "User", "Authenticated"); - + for (String item : roleListToCheck) { boolean found = false; for (GrantedAuthority ga : fedToken.getAuthorities()) { @@ -83,26 +83,26 @@ public class FederationServlet extends HttpServlet { } out.println("

role:" + item + "=" + (found ? "true" : "false") + "

"); } - + ClaimCollection claims = fedToken.getClaims(); for (Claim c : claims) { out.println("

" + c.getClaimType().toString() + "=" + c.getValue() + "

"); } - + Element el = fedToken.getLoginToken(); if (el != null) { out.println("loginToken=FOUND{FedizPrincipal}

"); } - + el = SecurityTokenThreadLocal.getToken(); if (el != null) { out.println("loginToken=FOUND{SecurityTokenThreadLocal}

"); } - + } - + out.println(""); - + } }