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 57F7117925 for ; Mon, 6 Oct 2014 11:14:57 +0000 (UTC) Received: (qmail 87767 invoked by uid 500); 6 Oct 2014 11:14:57 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87711 invoked by uid 500); 6 Oct 2014 11:14:57 -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 87702 invoked by uid 99); 6 Oct 2014 11:14:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2014 11:14:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F03579267D5; Mon, 6 Oct 2014 11:14:56 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fixing cache file location for SAML SSO Date: Mon, 6 Oct 2014 11:14:56 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 0eab963da -> 6085471de Fixing cache file location for SAML SSO Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6085471d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6085471d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6085471d Branch: refs/heads/master Commit: 6085471deb9974b1009eabcd2b067e7a5feec357 Parents: 0eab963 Author: Colm O hEigeartaigh Authored: Mon Oct 6 12:14:24 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon Oct 6 12:14:24 2014 +0100 ---------------------------------------------------------------------- .../apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java | 2 +- .../cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6085471d/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java index 5df8289..ce89d31 100644 --- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java +++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java @@ -45,7 +45,7 @@ public class EHCacheTokenReplayCache implements TokenReplayCache { public static final long DEFAULT_TTL = 3600L; public static final long MAX_TTL = DEFAULT_TTL * 12L; public static final String CACHE_KEY = "cxf.samlp.replay.cache"; - private static final String DEFAULT_CONFIG_URL = "cxf-samlp-ehcache.xml"; + private static final String DEFAULT_CONFIG_URL = "/cxf-samlp-ehcache.xml"; private Ehcache cache; private CacheManager cacheManager; http://git-wip-us.apache.org/repos/asf/cxf/blob/6085471d/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java index a3caa56..920a06d 100644 --- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java +++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java @@ -45,7 +45,7 @@ public class EHCacheSPStateManager implements SPStateManager { public static final long DEFAULT_TTL = 60L * 5L; public static final String REQUEST_CACHE_KEY = "cxf.samlp.request.state.cache"; public static final String RESPONSE_CACHE_KEY = "cxf.samlp.response.state.cache"; - private static final String DEFAULT_CONFIG_URL = "cxf-samlp-ehcache.xml"; + private static final String DEFAULT_CONFIG_URL = "/cxf-samlp-ehcache.xml"; private Ehcache requestCache; private Ehcache responseCache;