You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/13 20:47:49 UTC

svn commit: r1231274 - /cxf/branches/2.5.x-fixes/

Author: dkulp
Date: Fri Jan 13 19:47:48 2012
New Revision: 1231274

URL: http://svn.apache.org/viewvc?rev=1231274&view=rev
Log:
Recorded merge of revisions 1228085,1228270,1230194-1230195,1230255 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1228085 | coheigea | 2012-01-06 06:14:30 -0500 (Fri, 06 Jan 2012) | 1 line
  
  [CXF-4010] - Fix for failing tests
........
  r1228270 | coheigea | 2012-01-06 11:58:33 -0500 (Fri, 06 Jan 2012) | 3 lines
  
  [CXF-2864] - Support UsernameToken derived keys
   - Part I : Added support for derived keys from a UsernameToken when it's used as the ProtectionToken of the SymmetricBinding.
   - One important point is that it can only be used correctly for EITHER signature or encryption, but not both, as the salt in the U/T is different for both.
........
  r1230194 | owulff | 2012-01-11 14:11:51 -0500 (Wed, 11 Jan 2012) | 1 line
  
  [CXF-4021] Claims element support in RST for validate binding
........
  r1230195 | owulff | 2012-01-11 14:12:06 -0500 (Wed, 11 Jan 2012) | 1 line
  
  [CXF-3985] Support for attributes with multiple values in LdapClaimsHandler
........
  r1230255 | owulff | 2012-01-11 16:18:07 -0500 (Wed, 11 Jan 2012) | 1 line
  
  Failing sts systest fixed
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)

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