Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9069C10EE0 for ; Wed, 25 Jun 2014 17:54:47 +0000 (UTC) Received: (qmail 60776 invoked by uid 500); 25 Jun 2014 17:54:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 60586 invoked by uid 500); 25 Jun 2014 17:54:47 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 60571 invoked by uid 99); 25 Jun 2014 17:54:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2014 17:54:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2BB8998B211; Wed, 25 Jun 2014 17:54:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Wed, 25 Jun 2014 17:54:48 -0000 Message-Id: <81068f26bf0f4bd6a522c47ff54dbbcc@git.apache.org> In-Reply-To: <86c2a73892fd42208c7b53d55b7f7a92@git.apache.org> References: <86c2a73892fd42208c7b53d55b7f7a92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf 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 Authored: Wed Jun 25 18:54:29 2014 +0100 Committer: Colm O hEigeartaigh 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(-) ----------------------------------------------------------------------