You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/01 17:20:01 UTC
svn commit: r1498516 - in
/cxf/branches/2.7.x-fixes/services/sts/sts-core/src:
main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
Author: coheigea
Date: Mon Jul 1 15:20:01 2013
New Revision: 1498516
URL: http://svn.apache.org/r1498516
Log:
Fixing build
Modified:
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
Modified: cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java?rev=1498516&r1=1498515&r2=1498516&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java (original)
+++ cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java Mon Jul 1 15:20:01 2013
@@ -41,9 +41,9 @@ import org.apache.cxf.common.classloader
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.sts.IdentityMapper;
+import org.apache.cxf.ws.security.cache.EHCacheManagerHolder;
import org.apache.cxf.ws.security.tokenstore.TokenStoreFactory;
-import org.apache.wss4j.common.cache.EHCacheManagerHolder;
-import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import org.apache.ws.security.CustomTokenPrincipal;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
@@ -81,9 +81,9 @@ public class EHCacheIdentityCache
}
if (configFileURL != null) {
- cacheManager = EHCacheManagerHolder.getCacheManager(configFileURL);
+ cacheManager = EHCacheManagerHolder.getCacheManager(bus, configFileURL);
} else {
- cacheManager = EHCacheManagerHolder.getCacheManager(getDefaultConfigFileURL());
+ cacheManager = EHCacheManagerHolder.getCacheManager(bus, getDefaultConfigFileURL());
}
CacheConfiguration cc = EHCacheManagerHolder.getCacheConfiguration(key, cacheManager);
@@ -92,6 +92,7 @@ public class EHCacheIdentityCache
}
public MemoryIdentityCacheStatistics getStatistics() {
+
if (statistics == null) {
this.statistics = new MemoryIdentityCacheStatistics();
}
Modified: cxf/branches/2.7.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java?rev=1498516&r1=1498515&r2=1498516&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java (original)
+++ cxf/branches/2.7.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/EhCacheIdentityCacheTest.java Mon Jul 1 15:20:01 2013
@@ -22,7 +22,7 @@ package org.apache.cxf.sts.cache;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.sts.IdentityMapper;
-import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import org.apache.ws.security.CustomTokenPrincipal;
import org.junit.BeforeClass;