Author: dkulp Date: Fri Jan 27 00:55:26 2012 New Revision: 1236476 URL: http://svn.apache.org/viewvc?rev=1236476&view=rev Log: Blocked revisions 1235520,1235522,1235780,1236454-1236455 via svnmerge
................ r1235520 | dkulp | 2012-01-24 16:59:35 -0500 (Tue, 24 Jan 2012) | 9 lines Merged revisions 1235518 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1235518 | dkulp | 2012-01-24 16:54:32 -0500 (Tue, 24 Jan 2012) | 1 line Mark a bunch of things optional that we don't need all the time ........ ................ r1235522 | dkulp | 2012-01-24 17:03:30 -0500 (Tue, 24 Jan 2012) | 8 lines Blocked revisions 1235517 via svnmerge ........ r1235517 | dkulp | 2012-01-24 16:54:22 -0500 (Tue, 24 Jan 2012) | 1 line Updates to features.xml and various imports ........ ................ r1235780 | coheigea | 2012-01-25 09:51:32 -0500 (Wed, 25 Jan 2012) | 2 lines Adding tests that show how to use AES-GCM algorithms for encryption using custom WS-SecurityPolicy AlgorithmSuites - @Ignore'd until we pick up WSS4J 1.6.5 ................ r1236454 | dkulp | 2012-01-26 19:02:00 -0500 (Thu, 26 Jan 2012) | 10 lines Recorded merge of revisions 1235775 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1235775 | coheigea | 2012-01-25 09:48:26 -0500 (Wed, 25 Jan 2012) | 2 lines Adding tests that show how to use AES-GCM algorithms for encryption using custom WS-SecurityPolicy AlgorithmSuites - @Ignore'd until we pick up WSS4J 1.6.5 ........ ................ r1236455 | dkulp | 2012-01-26 19:02:53 -0500 (Thu, 26 Jan 2012) | 32 lines Blocked revisions 1235825,1236026-1236027,1236260,1236344,1236364,1236405 via svnmerge ........ r1235825 | cschneider | 2012-01-25 12:03:29 -0500 (Wed, 25 Jan 2012) | 1 line Optimize features ........ r1236026 | dkulp | 2012-01-25 21:40:49 -0500 (Wed, 25 Jan 2012) | 1 line Update some more things to get some additional test cases working ........ r1236027 | dkulp | 2012-01-25 21:40:58 -0500 (Wed, 25 Jan 2012) | 1 line Remove some completely duplicate code ........ r1236260 | cschneider | 2012-01-26 11:08:13 -0500 (Thu, 26 Jan 2012) | 1 line CXF-4065 Moving common-utilities into api ........ r1236344 | dkulp | 2012-01-26 13:34:37 -0500 (Thu, 26 Jan 2012) | 1 line Move all the JCA stuff into integration/jca to reduce API dependencies ........ r1236364 | dkulp | 2012-01-26 14:38:48 -0500 (Thu, 26 Jan 2012) | 1 line Add ws-addr feature ........ r1236405 | dkulp | 2012-01-26 16:57:37 -0500 (Thu, 26 Jan 2012) | 1 line Use the cxf-jaxws dep for wsn instead of the full cxf ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
