Author: dkulp
Date: Tue Oct  4 13:47:28 2011
New Revision: 1178782

URL: http://svn.apache.org/viewvc?rev=1178782&view=rev
Log:
Recorded merge of revisions 1178763 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1178763 | coheigea | 2011-10-04 08:00:43 -0400 (Tue, 04 Oct 2011) | 8 lines
  
  Added the ability to use the STSClient in an intermediary.
   - There is a new configuration property to disable storing issued tokens per 
exchange
   - Caching is enabled for OnBehalfOf or ActAs tokens
  
  
  Conflicts:
  
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
........

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

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


Reply via email to