Author: dkulp Date: Fri Mar 9 19:53:41 2012 New Revision: 1299010 URL: http://svn.apache.org/viewvc?rev=1299010&view=rev Log: Blocking revisions 1298966,1298967,1298968,1299006 via svn from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1298966 | dkulp | 2012-03-09 13:34:32 -0500 (Fri, 09 Mar 2012) | 9 lines Merged revisions 1298957 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1298957 | dkulp | 2012-03-09 13:18:09 -0500 (Fri, 09 Mar 2012) | 2 lines [CXF-4140] Make registerPublisher compliant with the spec ........ ........ ........ r1298967 | dkulp | 2012-03-09 13:34:38 -0500 (Fri, 09 Mar 2012) | 40 lines Recording revisions 1296995,1297034,1297925,1298871,1298956,1298957 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1296995 | coheigea | 2012-03-05 05:26:15 -0500 (Mon, 05 Mar 2012) | 2 lines Upgrading to WSS4J 1.6.5 ........ ........ r1297034 | coheigea | 2012-03-05 07:46:49 -0500 (Mon, 05 Mar 2012) | 2 lines [CXF-4160] - Support signing a SAML token using the requested signature and canonicalization algorithm ........ ........ r1297925 | coheigea | 2012-03-07 05:51:16 -0500 (Wed, 07 Mar 2012) | 2 lines [CXF-4166] - CXF does not always respect SecurityPolicy TokenInclusion for the AsymmetricBinding ........ ........ r1298871 | coheigea | 2012-03-09 10:25:02 -0500 (Fri, 09 Mar 2012) | 2 lines [CXF-1636] - Adding support for caching UsernameToken nonces and Timestamps ........ ........ r1298956 | dkulp | 2012-03-09 13:18:03 -0500 (Fri, 09 Mar 2012) | 2 lines Fix potential NPE ........ ........ r1298957 | dkulp | 2012-03-09 13:18:09 -0500 (Fri, 09 Mar 2012) | 2 lines [CXF-4140] Make registerPublisher compliant with the spec ........ ........ ........ r1298968 | dkulp | 2012-03-09 13:34:40 -0500 (Fri, 09 Mar 2012) | 69 lines Blocking revisions 1297072,1297436,1297588,1297971,1297999,1298359,1298470,1298567,1298586,1298801 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1297072 | sergeyb | 2012-03-05 09:32:40 -0500 (Mon, 05 Mar 2012) | 2 lines [CXF-3589] Prototyping the skeleton code for supporting saml web sso on the SP side based on Colm's test ........ ........ r1297436 | coheigea | 2012-03-06 07:11:26 -0500 (Tue, 06 Mar 2012) | 3 lines [CXF-4161] - Support processing a UseKey Element that uses a SecurityTokenReference to another token - Only merging this to trunk, as it breaks backwards compatibility in the KeyRequirements class. ........ ........ r1297588 | owulff | 2012-03-06 12:33:04 -0500 (Tue, 06 Mar 2012) | 2 lines [CXF-3882] Support for Claims transformation in validate or issue RST ........ ........ r1297971 | sergeyb | 2012-03-07 08:52:46 -0500 (Wed, 07 Mar 2012) | 2 lines [CXF-4112,CXF-4151] A lof of refactoring to do with supporting different grants, preauthorized tokens, etc ........ ........ r1297999 | coheigea | 2012-03-07 10:55:25 -0500 (Wed, 07 Mar 2012) | 2 lines [CXF-4168] - Support processing a KeyInfo/KeyValue child of UseKey in a RequestSecurityToken ........ ........ r1298359 | coheigea | 2012-03-08 06:15:17 -0500 (Thu, 08 Mar 2012) | 3 lines [CXF-4156] - Support SymmetricKeys for Entropy/BinarySecret Elements - Part I. ........ ........ r1298470 | sergeyb | 2012-03-08 11:57:36 -0500 (Thu, 08 Mar 2012) | 2 lines Initial commit for addressing the collision issue ........ ........ r1298567 | dkulp | 2012-03-08 15:40:12 -0500 (Thu, 08 Mar 2012) | 4 lines When WS-N is used with CXF in OSGi, wire in the jmx management and make sure it uses a bundle specific bus instead of the global Bus. Restore testing with the RI which apparently has been broken for a while. ........ ........ r1298586 | dkulp | 2012-03-08 16:15:34 -0500 (Thu, 08 Mar 2012) | 2 lines Fix build failure ........ ........ r1298801 | coheigea | 2012-03-09 07:11:34 -0500 (Fri, 09 Mar 2012) | 3 lines [CXF-4156] - Support SymmetricKeys for Entropy/BinarySecret Elements - Part II - Support for processing an EncryptedKey child of the client Entropy ........ ........ ........ r1299006 | dkulp | 2012-03-09 14:50:10 -0500 (Fri, 09 Mar 2012) | 17 lines Recording revisions 1298998,1298999 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1298998 | dkulp | 2012-03-09 14:32:02 -0500 (Fri, 09 Mar 2012) | 3 lines [CXF-4169] make nested exception causes available at the client Patch from Stefan Wachter applied ........ ........ r1298999 | dkulp | 2012-03-09 14:32:07 -0500 (Fri, 09 Mar 2012) | 2 lines [CXF-4163] Should not add xsd files with no namespace into JAXB ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
