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/d014f6ac Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d014f6ac Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d014f6ac Branch: refs/heads/master Commit: d014f6ac27228d90895343fadb9f9aab42066734 Parents: dae6111 27e80bb Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Jun 25 18:54:29 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Jun 25 18:54:29 2014 +0100 ---------------------------------------------------------------------- .../apache/cxf/common/util/Base64Utility.java | 4 +- .../cxf/common/util/Base64UtilityTest.java | 21 +++ .../oauth2/jwe/AbstractJweEncryptor.java | 79 +++++++---- .../security/oauth2/jwe/JweCompactProducer.java | 57 ++++---- .../rs/security/oauth2/jwe/JweEncryptor.java | 2 +- .../oauth2/jwe/JweEncryptorWorkerState.java | 43 ++++++ .../rs/security/oauth2/jwe/JweOutputStream.java | 133 +++++++++++++++++++ .../oauth2/jwe/WrappedKeyJweEncryptor.java | 7 + .../oauth2/jwt/jaxrs/JweWriterInterceptor.java | 31 ++++- .../oauth2/jwe/JweCompactReaderWriterTest.java | 6 +- .../oauth2/utils/crypto/CryptoUtils.java | 6 +- ...ingConfiguredAutoRewriteSoapAddressTest.java | 7 + ...gConfiguredNoAutoRewriteSoapAddressTest.java | 6 + .../jaxrs/security/jwt/JAXRSJweJwsTest.java | 4 +- .../systest/jms/shared/JMSSharedQueueTest.java | 84 ++++++------ .../systest/http/WSDLAddressRewriteTest.java | 5 + 16 files changed, 390 insertions(+), 105 deletions(-) ----------------------------------------------------------------------
