cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1438475 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/ rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/token/mac/
Date Fri, 25 Jan 2013 12:46:19 GMT
Author: sergeyb
Date: Fri Jan 25 12:46:18 2013
New Revision: 1438475

URL: http://svn.apache.org/viewvc?rev=1438475&view=rev
Log:
Merged revisions 1438474 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1438474 | sergeyb | 2013-01-25 12:44:04 +0000 (Fri, 25 Jan 2013) | 9 lines
  
  Merged revisions 1438472 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1438472 | sergeyb | 2013-01-25 12:42:02 +0000 (Fri, 25 Jan 2013) | 1 line
    
    [CXF-4783] NonceVerifier implementation, patch from Sasi M applied with very minor updates
  ........
................

Added:
    cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/NonceHistory.java
      - copied unchanged from r1438474, cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/NonceHistory.java
    cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/NonceStore.java
      - copied unchanged from r1438474, cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/NonceStore.java
    cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/NonceVerifierImpl.java
      - copied unchanged from r1438474, cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/NonceVerifierImpl.java
    cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/token/mac/NonceVerifierImplTest.java
      - copied unchanged from r1438474, cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/token/mac/NonceVerifierImplTest.java
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 25 12:46:18 2013
@@ -0,0 +1,2 @@
+/cxf/branches/2.7.x-fixes:1438474
+/cxf/trunk:1438472

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.



Mime
View raw message