Author: dkulp Date: Thu Aug 8 19:22:01 2013 New Revision: 1511970 URL: http://svn.apache.org/r1511970 Log: Merged revisions 1510998 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1510998 | dkulp | 2013-08-06 11:34:28 -0400 (Tue, 06 Aug 2013) | 10 lines Merged revisions 1510991 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1510991 | dkulp | 2013-08-06 11:14:35 -0400 (Tue, 06 Aug 2013) | 2 lines Fix all the eclipse warnings ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java Modified: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java?rev=1511970&r1=1511969&r2=1511970&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java Thu Aug 8 19:22:01 2013 @@ -145,8 +145,10 @@ public class EHCacheTokenReplayCache imp parsedTTL = 3600; } } - - cache.put(new Element(id, id, false, parsedTTL, parsedTTL)); + Element element = new Element(id, id); + element.setTimeToLive(parsedTTL); + element.setTimeToIdle(parsedTTL); + cache.put(element); } /** Modified: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java?rev=1511970&r1=1511969&r2=1511970&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java Thu Aug 8 19:22:01 2013 @@ -156,8 +156,11 @@ public class EHCacheSPStateManager imple // Fall back to 5 minutes if the default TTL is set incorrectly parsedTTL = 60 * 5; } + Element element = new Element(securityContextKey, state); + element.setTimeToLive(parsedTTL); + element.setTimeToIdle(parsedTTL); - responseCache.put(new Element(securityContextKey, state, false, parsedTTL, parsedTTL)); + responseCache.put(element); } public void setRequestState(String relayState, RequestState state) { @@ -171,7 +174,10 @@ public class EHCacheSPStateManager imple parsedTTL = 3600; } - requestCache.put(new Element(relayState, state, false, parsedTTL, parsedTTL)); + Element element = new Element(relayState, state); + element.setTimeToLive(parsedTTL); + element.setTimeToIdle(parsedTTL); + requestCache.put(element); } public RequestState removeRequestState(String relayState) { Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java?rev=1511970&r1=1511969&r2=1511970&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java Thu Aug 8 19:22:01 2013 @@ -61,8 +61,9 @@ public class EHCacheTokenStore implement cacheManager = EHCacheManagerHolder.getCacheManager(bus, configFileURL); // Cannot overflow to disk as SecurityToken Elements can't be serialized - CacheConfiguration cc = EHCacheManagerHolder.getCacheConfiguration(key, cacheManager); - cc.overflowToDisk(false); //tokens not writable + @SuppressWarnings("deprecation") + CacheConfiguration cc = EHCacheManagerHolder.getCacheConfiguration(key, cacheManager) + .overflowToDisk(false); //tokens not writable Ehcache newCache = new Cache(cc); cache = cacheManager.addCacheIfAbsent(newCache); @@ -91,7 +92,10 @@ public class EHCacheTokenStore implement if (token != null && !StringUtils.isEmpty(token.getId())) { int parsedTTL = getTTL(token); if (parsedTTL > 0) { - cache.put(new Element(token.getId(), token, false, parsedTTL, parsedTTL)); + Element element = new Element(token.getId(), token); + element.setTimeToLive(parsedTTL); + element.setTimeToIdle(parsedTTL); + cache.put(element); } } } @@ -100,7 +104,10 @@ public class EHCacheTokenStore implement if (token != null && !StringUtils.isEmpty(identifier)) { int parsedTTL = getTTL(token); if (parsedTTL > 0) { - cache.put(new Element(identifier, token, false, parsedTTL, parsedTTL)); + Element element = new Element(identifier, token); + element.setTimeToLive(parsedTTL); + element.setTimeToIdle(parsedTTL); + cache.put(element); } } }
