cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Date Tue, 14 Oct 2014 14:46:26 GMT
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/3ade4ba5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ade4ba5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ade4ba5

Branch: refs/heads/master
Commit: 3ade4ba504de84a355eb7ae53c3fd32f9e54e75c
Parents: 4fe7844 0cfedc9
Author: reta <drreta@gmail.com>
Authored: Tue Oct 14 10:39:05 2014 -0400
Committer: reta <drreta@gmail.com>
Committed: Tue Oct 14 10:39:05 2014 -0400

----------------------------------------------------------------------
 .../provider/json/AbstractJsonMapObject.java    |  61 +++++
 .../json/JsonMapObjectReaderWriter.java         | 219 ++++++++++++++++++
 rt/rs/security/jose/pom.xml                     |   5 +
 .../rs/security/jose/AbstractJoseObject.java    |  61 -----
 .../jose/AbstractJoseObjectReaderWriter.java    | 230 -------------------
 .../cxf/rs/security/jose/JoseHeaders.java       |   3 +-
 .../security/jose/JoseHeadersReaderWriter.java  |   6 +-
 .../jose/jwk/DefaultJwkReaderWriter.java        |   9 +-
 .../cxf/rs/security/jose/jwk/JsonWebKey.java    |   4 +-
 .../cxf/rs/security/jose/jwk/JsonWebKeys.java   |   4 +-
 .../cxf/rs/security/jose/jwt/JwtClaims.java     |   4 +-
 .../security/jose/jwt/JwtTokenReaderWriter.java |  20 +-
 .../wss4j/UsernameTokenInterceptor.java         |   7 +
 .../apache/cxf/systest/ws/ut/DoubleItUt.wsdl    |   2 +
 14 files changed, 329 insertions(+), 306 deletions(-)
----------------------------------------------------------------------



Mime
View raw message