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 B59BE200B49 for ; Wed, 3 Aug 2016 19:05:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B430D160AB1; Wed, 3 Aug 2016 17:05:16 +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 D1E8A160A5D for ; Wed, 3 Aug 2016 19:05:15 +0200 (CEST) Received: (qmail 86456 invoked by uid 500); 3 Aug 2016 17:05:15 -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 86438 invoked by uid 99); 3 Aug 2016 17:05:15 -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, 03 Aug 2016 17:05:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BEF76EC232; Wed, 3 Aug 2016 17:05:14 +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: Wed, 03 Aug 2016 17:05:14 -0000 Message-Id: <1d80df175bfb4084b48719c6bd59d248@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] cxf git commit: Splitting realm configuration into a separate file archived-at: Wed, 03 Aug 2016 17:05:16 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes f00d7da9a -> fd958fdbc Splitting realm configuration into a separate file Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/736e7d46 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/736e7d46 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/736e7d46 Branch: refs/heads/3.1.x-fixes Commit: 736e7d464e3a6261ecfc041709924b7effc00cce Parents: f00d7da Author: Colm O hEigeartaigh Authored: Wed Aug 3 15:16:02 2016 +0100 Committer: Colm O hEigeartaigh Committed: Wed Aug 3 18:05:03 2016 +0100 ---------------------------------------------------------------------- .../cxf/sts/token/realm/RealmProperties.java | 17 ++++++++++ .../systest/sts/deployment/cxf-transport.xml | 13 ++------ .../cxf/systest/sts/deployment/realms.xml | 33 ++++++++++++++++++++ .../sts/deployment/stax-cxf-transport.xml | 13 ++------ 4 files changed, 56 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/736e7d46/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java index dfe65c6..8909248 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java @@ -41,6 +41,7 @@ public class RealmProperties { private static final Logger LOG = LogUtils.getL7dLogger(RealmProperties.class); + private String name; private String issuer; private String signatureAlias; private Crypto signatureCrypto; @@ -58,6 +59,22 @@ public class RealmProperties { } /** + * Get the name of this realm + * @return realmA + */ + public String getName() { + return name; + } + + /** + * Set the name of this realm + * @param name the name of this realm + */ + public void setName(String name) { + this.name = name; + } + + /** * Set the issuer of this realm * @param issuer the issuer of this realm */ http://git-wip-us.apache.org/repos/asf/cxf/blob/736e7d46/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml index b2b3404..8d721d9 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml @@ -24,6 +24,9 @@ + + + @@ -96,16 +99,6 @@ https://localhost:(\d)*/doubleit/services/doubleittransport.* - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/736e7d46/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/realms.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/realms.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/realms.xml new file mode 100644 index 0000000..4aee41d --- /dev/null +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/realms.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/736e7d46/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml index 43c75c7..8405022 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml @@ -24,6 +24,9 @@ + + + @@ -84,16 +87,6 @@ https://localhost:(\d)*/doubleit/services/doubleittransport.* - - - - - - - - - -