git commit: [CXF-5886] Prototyping default OAuth2 Ehcache providers, to be tuned later on
Repository: cxf
Updated Branches:
refs/heads/master 5cc2ed0f4 - 43c8d500b
[CXF-5886] Prototyping default OAuth2 Ehcache providers, to be tuned later on
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/43c8d500
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/43c8d500
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/43c8d500
Branch: refs/heads/master
Commit: 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
Parents: 5cc2ed0
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Aug 18 18:12:36 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Aug 18 18:12:36 2014 +0100
--
rt/rs/security/oauth-parent/oauth2/pom.xml | 12 ++
.../AbstractAuthorizationCodeDataProvider.java | 6 +-
.../code/DefaultEHCacheCodeDataProvider.java| 110
.../provider/AbstractOAuthDataProvider.java | 149
.../DefaultEHCacheOAuthDataProvider.java| 168 +++
.../rs/security/oauth2/utils/EHCacheUtil.java | 88 ++
6 files changed, 531 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/43c8d500/rt/rs/security/oauth-parent/oauth2/pom.xml
--
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 0832c5b..5e2661b 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -30,6 +30,11 @@
version3.1.0-SNAPSHOT/version
relativePath../pom.xml/relativePath
/parent
+properties
+cxf.osgi.import
+net.sf.ehcache*;resolution:=optional;version=[2.5, 3.0.0),
+/cxf.osgi.import
+/properties
dependencies
dependency
groupIdorg.apache.cxf/groupId
@@ -47,6 +52,13 @@
scopeprovided/scope
optionaltrue/optional
/dependency
+dependency
+groupIdnet.sf.ehcache/groupId
+artifactIdehcache/artifactId
+version${cxf.ehcache.version}/version
+scopeprovided/scope
+optionaltrue/optional
+/dependency
!--test dependencies--
dependency
groupIdorg.apache.cxf/groupId
http://git-wip-us.apache.org/repos/asf/cxf/blob/43c8d500/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
index bb717fd..71f1002 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.oauth2.grants.code;
import java.util.List;
+import org.apache.cxf.rs.security.oauth2.provider.AbstractOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
@@ -28,9 +29,10 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
/**
* Abstract AuthorizationCodeDataProvider implementation
*/
-public abstract class AbstractAuthorizationCodeDataProvider implements
AuthorizationCodeDataProvider {
+public abstract class AbstractAuthorizationCodeDataProvider
+extends AbstractOAuthDataProvider implements AuthorizationCodeDataProvider
{
-private long grantLifetime;
+private long grantLifetime = 3600L;
public ServerAuthorizationCodeGrant
createCodeGrant(AuthorizationCodeRegistration reg)
throws OAuthServiceException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/43c8d500/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
new file mode 100644
index 000..c4e261f
--- /dev/null
+++
git commit: [CXF-5886] Prototyping default OAuth2 Ehcache providers, to be tuned later on
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 345ccc219 - d27c70ba0
[CXF-5886] Prototyping default OAuth2 Ehcache providers, to be tuned later on
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d27c70ba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d27c70ba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d27c70ba
Branch: refs/heads/3.0.x-fixes
Commit: d27c70ba09faaead062bb554bb383a348919ecd9
Parents: 345ccc2
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Aug 18 18:12:36 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Aug 18 18:15:32 2014 +0100
--
rt/rs/security/oauth-parent/oauth2/pom.xml | 12 ++
.../AbstractAuthorizationCodeDataProvider.java | 6 +-
.../code/DefaultEHCacheCodeDataProvider.java| 110
.../provider/AbstractOAuthDataProvider.java | 149
.../DefaultEHCacheOAuthDataProvider.java| 168 +++
.../rs/security/oauth2/utils/EHCacheUtil.java | 88 ++
6 files changed, 531 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d27c70ba/rt/rs/security/oauth-parent/oauth2/pom.xml
--
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 11fa420..b221635 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -30,6 +30,11 @@
version3.0.2-SNAPSHOT/version
relativePath../pom.xml/relativePath
/parent
+properties
+cxf.osgi.import
+net.sf.ehcache*;resolution:=optional;version=[2.5, 3.0.0),
+/cxf.osgi.import
+/properties
dependencies
dependency
groupIdorg.apache.cxf/groupId
@@ -47,6 +52,13 @@
scopeprovided/scope
optionaltrue/optional
/dependency
+dependency
+groupIdnet.sf.ehcache/groupId
+artifactIdehcache/artifactId
+version${cxf.ehcache.version}/version
+scopeprovided/scope
+optionaltrue/optional
+/dependency
!--test dependencies--
dependency
groupIdorg.apache.cxf/groupId
http://git-wip-us.apache.org/repos/asf/cxf/blob/d27c70ba/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
index bb717fd..71f1002 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AbstractAuthorizationCodeDataProvider.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.oauth2.grants.code;
import java.util.List;
+import org.apache.cxf.rs.security.oauth2.provider.AbstractOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
@@ -28,9 +29,10 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
/**
* Abstract AuthorizationCodeDataProvider implementation
*/
-public abstract class AbstractAuthorizationCodeDataProvider implements
AuthorizationCodeDataProvider {
+public abstract class AbstractAuthorizationCodeDataProvider
+extends AbstractOAuthDataProvider implements AuthorizationCodeDataProvider
{
-private long grantLifetime;
+private long grantLifetime = 3600L;
public ServerAuthorizationCodeGrant
createCodeGrant(AuthorizationCodeRegistration reg)
throws OAuthServiceException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d27c70ba/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
new file mode 100644
index 000..c4e261f
--- /dev/null
+++
