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 C4F50200C41 for ; Fri, 24 Mar 2017 13:29:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C39DE160B93; Fri, 24 Mar 2017 12:29:10 +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 1B019160B96 for ; Fri, 24 Mar 2017 13:29:09 +0100 (CET) Received: (qmail 80050 invoked by uid 500); 24 Mar 2017 12:29:09 -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 79803 invoked by uid 99); 24 Mar 2017 12:29:09 -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; Fri, 24 Mar 2017 12:29:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EF5BADFB31; Fri, 24 Mar 2017 12:29:08 +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: Fri, 24 Mar 2017 12:29:09 -0000 Message-Id: <4f74dd4acf6440c89edf5056070d7ad3@git.apache.org> In-Reply-To: <5c0c69fe97f74492ad350b535fdcc44b@git.apache.org> References: <5c0c69fe97f74492ad350b535fdcc44b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cxf git commit: CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException archived-at: Fri, 24 Mar 2017 12:29:11 -0000 CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException # Conflicts: # services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/66b8d91f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/66b8d91f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/66b8d91f Branch: refs/heads/3.1.x-fixes Commit: 66b8d91fbda66959bfc41d59878e248ff23239fc Parents: b951579 Author: Colm O hEigeartaigh Authored: Fri Mar 24 12:04:33 2017 +0000 Committer: Colm O hEigeartaigh Committed: Fri Mar 24 12:08:15 2017 +0000 ---------------------------------------------------------------------- .../cxf/systest/sts/common/CustomIdentityMapper.java | 4 ++-- .../cxf/systest/sts/issueunit/IssueUnitTest.java | 14 ++++++++++++++ .../apache/cxf/systest/sts/deployment/sts/realms.xml | 9 +++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/66b8d91f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java index 59c8c31..5a94433 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java @@ -20,13 +20,13 @@ package org.apache.cxf.systest.sts.common; import java.security.Principal; -import org.apache.cxf.sts.IdentityMapper; +import org.apache.cxf.sts.cache.MemoryIdentityCache; import org.apache.wss4j.common.principal.CustomTokenPrincipal; /** * A test implementation of IdentityMapper. */ -public class CustomIdentityMapper implements IdentityMapper { +public class CustomIdentityMapper extends MemoryIdentityCache { /** * Map a principal in the source realm to the target realm http://git-wip-us.apache.org/repos/asf/cxf/blob/66b8d91f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java index b8de1fb..49963d6 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java @@ -387,8 +387,12 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { bus.shutdown(true); } +<<<<<<< HEAD //CHECKSTYLE:OFF +======= + +>>>>>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException @org.junit.Test public void testSAMLinWSSecToOtherRealm() throws Exception { SpringBusFactory bf = new SpringBusFactory(); @@ -476,7 +480,12 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { ) throws Exception { return requestSecurityToken(tokenType, keyType, null, bus, endpointAddress, context, null, null, null); } +<<<<<<< HEAD +======= + + // CHECKSTYLE:OFF +>>>>>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException private SecurityToken requestSecurityToken( String tokenType, String keyType, @@ -533,7 +542,12 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { return stsClient.requestSecurityToken(endpointAddress); } +<<<<<<< HEAD +======= + // CHECKSTYLE:ON + +>>>>>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException private Properties getEncryptionProperties() { Properties properties = new Properties(); properties.put( http://git-wip-us.apache.org/repos/asf/cxf/blob/66b8d91f/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml index d42be3b..cc1c26f 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml @@ -36,13 +36,18 @@ - + + + + + + - +