Author: dkulp Date: Tue Feb 21 22:04:33 2012 New Revision: 1292059 URL: http://svn.apache.org/viewvc?rev=1292059&view=rev Log: Blocking revisions 1245675,1291194,1291220,1291599,1291637,1291995,1291996 via svn from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1245675 | coheigea | 2012-02-17 12:29:40 -0500 (Fri, 17 Feb 2012) | 3 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 ........ ........ r1291194 | coheigea | 2012-02-20 06:11:59 -0500 (Mon, 20 Feb 2012) | 1 line [CXF-2864] - Support UsernameToken derived keys ........ ........ r1291220 | coheigea | 2012-02-20 06:55:21 -0500 (Mon, 20 Feb 2012) | 1 line Re-enabling GCM tests. Added default custom AlgorithmSuites that can be used for GCM algorithms. ........ ........ r1291599 | ffang | 2012-02-21 00:10:10 -0500 (Tue, 21 Feb 2012) | 31 lines Merged revisions 1291176-1291191,1291193-1291218,1291220-1291591 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1291176 | ffang | 2012-02-20 18:10:21 +0800 (一, 20 2 2012) | 13 lines Merged revisions 1291166-1291167 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1291166 | ffang | 2012-02-20 17:51:20 +0800 (一, 20 2 2012) | 1 line [CXF-4119]support Certificates revocation check before encrypt when use CXF WS-SecurityPolicy ........ r1291167 | ffang | 2012-02-20 18:01:32 +0800 (一, 20 2 2012) | 1 line [CXF-4119]support Certificates revocation check before encrypt when use CXF WS-SecurityPolicy ........ ................ r1291591 | ffang | 2012-02-21 12:43:56 +0800 (二, 21 2 2012) | 9 lines Merged revisions 1291583 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1291583 | ffang | 2012-02-21 11:54:59 +0800 (二, 21 2 2012) | 1 line [CXF-4119]use jaxws property to configure enableRevocation ........ ................ ........ ........ r1291637 | ffang | 2012-02-21 02:51:45 -0500 (Tue, 21 Feb 2012) | 16 lines Merged revisions 1291635 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1291635 | ffang | 2012-02-21 15:45:50 +0800 (二, 21 2 2012) | 9 lines Merged revisions 1291628 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1291628 | ffang | 2012-02-21 15:31:08 +0800 (二, 21 2 2012) | 1 line [CXF-4122]CXFRequestData should get chance to setEnableRevocation from message context When use WS-SecurityPolicy ........ ................ ........ ........ r1291995 | dkulp | 2012-02-21 15:43:19 -0500 (Tue, 21 Feb 2012) | 21 lines Recording revisions 1245672,1291192,1291219 via svn from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1245672 | coheigea | 2012-02-17 12:26:29 -0500 (Fri, 17 Feb 2012) | 3 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 ........ ........ r1291192 | coheigea | 2012-02-20 06:01:42 -0500 (Mon, 20 Feb 2012) | 1 line [CXF-2864] - Support UsernameToken derived keys ........ ........ r1291219 | coheigea | 2012-02-20 06:51:10 -0500 (Mon, 20 Feb 2012) | 1 line Re-enabling GCM tests. Added default custom AlgorithmSuites that can be used for GCM algorithms. ........ ........ ........ r1291996 | dkulp | 2012-02-21 15:43:22 -0500 (Tue, 21 Feb 2012) | 78 lines 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.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
