You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/11/26 22:45:24 UTC
[1/2] cxf git commit: Adding Ehcache provider close method
Repository: cxf
Updated Branches:
refs/heads/master 59973442d -> 37ffe1288
Adding Ehcache provider close method
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a58e610
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a58e610
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a58e610
Branch: refs/heads/master
Commit: 1a58e610945e975bcce9c339731d9b5095576196
Parents: a5d7bca
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Nov 26 21:44:37 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Nov 26 21:44:37 2015 +0000
----------------------------------------------------------------------
.../oauth2/grants/code/DefaultEHCacheCodeDataProvider.java | 5 +++--
.../oauth2/provider/DefaultEHCacheOAuthDataProvider.java | 7 +++++--
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1a58e610/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index 1419329..ceb4ba0 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.oauth2.grants.code;
import net.sf.ehcache.Ehcache;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.rs.security.oauth2.provider.DefaultEHCacheOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
@@ -32,7 +33,7 @@ public class DefaultEHCacheCodeDataProvider extends DefaultEHCacheOAuthDataProvi
private Ehcache codeGrantCache;
protected DefaultEHCacheCodeDataProvider() {
- this(DEFAULT_CONFIG_URL, null);
+ this(DEFAULT_CONFIG_URL, BusFactory.getThreadDefaultBus(true));
}
protected DefaultEHCacheCodeDataProvider(String configFileURL, Bus bus) {
@@ -72,7 +73,7 @@ public class DefaultEHCacheCodeDataProvider extends DefaultEHCacheOAuthDataProvi
protected void saveCodeGrant(ServerAuthorizationCodeGrant grant) {
putCacheValue(codeGrantCache, grant.getCode(), grant, grant.getExpiresIn());
}
-
+
public void setCodeLifetime(long codeLifetime) {
this.codeLifetime = codeLifetime;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1a58e610/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index 23891d2..f78d012 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
@@ -54,7 +54,7 @@ public class DefaultEHCacheOAuthDataProvider extends AbstractOAuthDataProvider
private Ehcache refreshTokenCache;
public DefaultEHCacheOAuthDataProvider() {
- this(DEFAULT_CONFIG_URL, null);
+ this(DEFAULT_CONFIG_URL, BusFactory.getThreadDefaultBus(true));
}
public DefaultEHCacheOAuthDataProvider(String configFileURL, Bus bus) {
@@ -193,5 +193,8 @@ public class DefaultEHCacheOAuthDataProvider extends AbstractOAuthDataProvider
refreshTokenCache = createCache(cacheManager, refreshTokenKey);
}
-
+ public void close() {
+ cacheManager.shutdown();
+ }
+
}
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/37ffe128
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/37ffe128
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/37ffe128
Branch: refs/heads/master
Commit: 37ffe1288c7e199e186fe4c2506fedf60bfa834f
Parents: 1a58e61 5997344
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Nov 26 21:45:08 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Nov 26 21:45:08 2015 +0000
----------------------------------------------------------------------
.../systest/jms/security/JMSWSSecurityTest.java | 122 ++++++++++++++++++-
1 file changed, 121 insertions(+), 1 deletion(-)
----------------------------------------------------------------------