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 05A5E10AA5 for ; Tue, 27 May 2014 16:29:55 +0000 (UTC) Received: (qmail 85829 invoked by uid 500); 27 May 2014 16:29:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 85767 invoked by uid 500); 27 May 2014 16:29:54 -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 85760 invoked by uid 99); 27 May 2014 16:29:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2014 16:29:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 82FCE32A24E; Tue, 27 May 2014 16:29:54 +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 Message-Id: <0f8fb13eb9744350825cd2a49e42c7b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [FEDIZ-70] Missing support for Web Services Policy 1.2 Date: Tue, 27 May 2014 16:29:54 +0000 (UTC) Repository: cxf-fediz Updated Branches: refs/heads/1.1.x-fixes 4fa62cf44 -> b6fc8ee74 [FEDIZ-70] Missing support for Web Services Policy 1.2 git-svn-id: https://svn.apache.org/repos/asf/cxf/fediz/trunk@1570351 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Application.java services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b6fc8ee7 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b6fc8ee7 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b6fc8ee7 Branch: refs/heads/1.1.x-fixes Commit: b6fc8ee74fb8c7dc8f8d35aa65412fd89240907c Parents: 4fa62cf Author: owulff Authored: Thu Feb 20 20:56:19 2014 +0000 Committer: Colm O hEigeartaigh Committed: Tue May 27 17:29:48 2014 +0100 ---------------------------------------------------------------------- .../apache/cxf/fediz/service/idp/beans/STSClientAction.java | 5 +++++ .../apache/cxf/fediz/service/idp/model/ServiceConfig.java | 9 +++++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b6fc8ee7/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java ---------------------------------------------------------------------- diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java index 9e52449..8b039e0 100644 --- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java +++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java @@ -177,6 +177,11 @@ public class STSClientAction { } else { sts.setTokenType(getTokenType()); } + + if (serviceConfig.getPolicyNamespace() != null && serviceConfig.getPolicyNamespace().length() > 0) { + sts.setWspNamespace(serviceConfig.getPolicyNamespace()); + } + if (LOG.isDebugEnabled()) { LOG.debug("TokenType " + sts.getTokenType() + " set for " + wtrealm); } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b6fc8ee7/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java ---------------------------------------------------------------------- diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java index 08cf07a..7f94007 100644 --- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java +++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java @@ -74,6 +74,9 @@ public class ServiceConfig implements Serializable { // Not in Metadata, configured in IDP or passed in wreq parameter private String lifeTime; + // WS-Policy Namespace for AppliesTo element + private String policyNamespace; + public String getRealm() { return realm; } @@ -146,5 +149,11 @@ public class ServiceConfig implements Serializable { this.lifeTime = lifeTime; } + public String getPolicyNamespace() { + return policyNamespace; + } + public void setPolicyNamespace(String policyNamespace) { + this.policyNamespace = policyNamespace; + } }