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 0104DEB8F for ; Wed, 23 Jan 2013 17:01:46 +0000 (UTC) Received: (qmail 35978 invoked by uid 500); 23 Jan 2013 17:01:45 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35929 invoked by uid 500); 23 Jan 2013 17:01:45 -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 35922 invoked by uid 99); 23 Jan 2013 17:01:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 17:01:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 17:01:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E53ED23889E2; Wed, 23 Jan 2013 17:01:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1437570 - in /cxf/branches/2.7.x-fixes: ./ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAuthorizationScheme.java Date: Wed, 23 Jan 2013 17:01:25 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130123170125.E53ED23889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Wed Jan 23 17:01:25 2013 New Revision: 1437570 URL: http://svn.apache.org/viewvc?rev=1437570&view=rev Log: Merged revisions 1437409 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1437409 | sergeyb | 2013-01-23 14:30:58 +0000 (Wed, 23 Jan 2013) | 1 line [CXF-4771] Removing a trailing comma in MAC representation ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAuthorizationScheme.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1437409 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAuthorizationScheme.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAuthorizationScheme.java?rev=1437570&r1=1437569&r2=1437570&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAuthorizationScheme.java (original) +++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAuthorizationScheme.java Wed Jan 23 17:01:25 2013 @@ -73,7 +73,7 @@ public class MacAuthorizationScheme { addParameter(sb, OAuthConstants.MAC_TOKEN_ID, macKey, false); addParameter(sb, OAuthConstants.MAC_TOKEN_NONCE, nonce, false); addParameter(sb, OAuthConstants.MAC_TOKEN_SIGNATURE, signature, false); - addParameter(sb, OAuthConstants.MAC_TOKEN_TIMESTAMP, timestamp, false); + addParameter(sb, OAuthConstants.MAC_TOKEN_TIMESTAMP, timestamp, true); return sb.toString();