cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Date Mon, 12 Oct 2015 14:04:37 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

Conflicts:
	rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3ce1e1fc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ce1e1fc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ce1e1fc

Branch: refs/heads/master
Commit: 3ce1e1fcc18ecce2f7039db047a9d98e3cfe4c95
Parents: d2d8f6d 168b101
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Oct 12 14:54:23 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Oct 12 14:54:23 2015 +0100

----------------------------------------------------------------------
 .../security/jose/jaxrs/JwtAuthenticationFilter.java   | 11 ++++++++++-
 .../org/apache/cxf/rs/security/jose/jwt/JwtUtils.java  | 13 +++++++++----
 .../rs/security/oidc/rp/AbstractTokenValidator.java    | 11 ++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/3ce1e1fc/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
----------------------------------------------------------------------
diff --cc rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index d2ead25,295879d..3c64890
--- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@@ -45,7 -45,7 +45,8 @@@ public class JwtAuthenticationFilter ex
      private static final String DEFAULT_AUTH_SCHEME = "JWT";
      private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
      private int clockOffset;
 +    private String roleClaim;
+     private int ttl;
      
      @Override
      public void filter(ContainerRequestContext requestContext) throws IOException {
@@@ -93,12 -83,12 +94,20 @@@
      public void setClockOffset(int clockOffset) {
          this.clockOffset = clockOffset;
      }
 +    
 +    public String getRoleClaim() {
 +        return roleClaim;
 +    }
 +
 +    public void setRoleClaim(String roleClaim) {
 +        this.roleClaim = roleClaim;
 +    }
+ 
+     public int getTtl() {
+         return ttl;
+     }
+ 
+     public void setTtl(int ttl) {
+         this.ttl = ttl;
+     }
  }


Mime
View raw message