Author: dkulp Date: Tue Feb 21 20:43:22 2012 New Revision: 1291996 URL: http://svn.apache.org/viewvc?rev=1291996&view=rev Log: Blocking revisions 1245667,1245668,1291815,1291975 via svn from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1245667 | dkulp | 2012-02-17 12:24:24 -0500 (Fri, 17 Feb 2012) | 10 lines Recording revisions 1245664 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245664 | dkulp | 2012-02-17 12:22:04 -0500 (Fri, 17 Feb 2012) | 2 lines Use a valid policy ........ ........ ........ r1245668 | dkulp | 2012-02-17 12:24:26 -0500 (Fri, 17 Feb 2012) | 11 lines Blocking revisions 1245609 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245609 | dkulp | 2012-02-17 10:27:30 -0500 (Fri, 17 Feb 2012) | 3 lines SVN 1.7.2 seems to need an up after a commit or various parts of the directory tree get out of sync and will refuse to merge anything again. ........ ........ ........ r1291815 | coheigea | 2012-02-21 09:44:54 -0500 (Tue, 21 Feb 2012) | 1 line Enabling secure validation for RS-Security ........ ........ r1291975 | dkulp | 2012-02-21 15:04:42 -0500 (Tue, 21 Feb 2012) | 36 lines Recording revisions 1245665,1291189,1291217,1291746,1291771 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245665 | coheigea | 2012-02-17 12:22:25 -0500 (Fri, 17 Feb 2012) | 4 lines [CXF-4034][CXF-3809] - Upgrade to WSS4J 1.6.5-SNAPSHOT - Allow SecurityConstants.SIGNATURE_CRYPTO and ENCRYPT_CRYPTO to be used on processing side - Tests with OpenJDK now working due to Santuario 1.5 upgrade ........ ........ r1291189 | coheigea | 2012-02-20 05:53:01 -0500 (Mon, 20 Feb 2012) | 2 lines [CXF-2864] - Support UsernameToken derived keys ........ ........ r1291217 | coheigea | 2012-02-20 06:49:11 -0500 (Mon, 20 Feb 2012) | 2 lines Re-enabling GCM tests. Added default custom AlgorithmSuites that can be used for GCM algorithms. ........ ........ r1291746 | ffang | 2012-02-21 07:42:59 -0500 (Tue, 21 Feb 2012) | 2 lines make checkstyle happy ........ ........ r1291771 | coheigea | 2012-02-21 08:29:03 -0500 (Tue, 21 Feb 2012) | 2 lines Enabling secure validation for RS-Security ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
