Author: dkulp Date: Fri Mar 2 16:57:42 2012 New Revision: 1296310 URL: http://svn.apache.org/viewvc?rev=1296310&view=rev Log: Blocking revisions 1293220,1295505,1296029,1296180,1296307 via svn from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1293220 | coheigea | 2012-02-24 07:30:48 -0500 (Fri, 24 Feb 2012) | 1 line Fixed failing RS-Security tests with the IBM JDK and Santuario 1.5.x ........ ........ r1295505 | sergeyb | 2012-03-01 05:43:12 -0500 (Thu, 01 Mar 2012) | 9 lines Merged revisions 1295504 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1295504 | sergeyb | 2012-03-01 10:40:27 +0000 (Thu, 01 Mar 2012) | 1 line Re-enabling oauth10 test ........ ........ ........ r1296029 | dkulp | 2012-03-01 20:55:00 -0500 (Thu, 01 Mar 2012) | 19 lines Blocking revisions 1295190,1295681,1295685 via svn from https://svn.apache.org/repos/asf/cxf/trunk ........ r1295190 | sergeyb | 2012-02-29 12:27:23 -0500 (Wed, 29 Feb 2012) | 1 line [CXF-4112] Removing enum classes for now as they are awkward to deal with for custom token or grant types plus few more minor updates ........ ........ r1295681 | sergeyb | 2012-03-01 12:13:45 -0500 (Thu, 01 Mar 2012) | 1 line [CXF-4112] Preparing the code to deal with multiple grant types better ........ ........ r1295685 | sergeyb | 2012-03-01 12:19:46 -0500 (Thu, 01 Mar 2012) | 1 line [CXF-4151] Prototyping the initial code for the client_credentials grant ........ ........ ........ r1296180 | sergeyb | 2012-03-02 07:56:17 -0500 (Fri, 02 Mar 2012) | 9 lines Merged revisions 1296174 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1296174 | sergeyb | 2012-03-02 12:52:39 +0000 (Fri, 02 Mar 2012) | 1 line Minor fix to the oauth10 module ........ ........ ........ r1296307 | dkulp | 2012-03-02 11:54:43 -0500 (Fri, 02 Mar 2012) | 17 lines Recording revisions 1296118,1296290 via svn from https://svn.apache.org/repos/asf/cxf/trunk ........ r1296118 | coheigea | 2012-03-02 05:33:28 -0500 (Fri, 02 Mar 2012) | 3 lines [CXF-4049] - Check external CryptoProvider from message context properties in Wss4jInInterceptor - Patch applied, thanks. - I made some changes as per my comments in the JIRA. ........ ........ r1296290 | coheigea | 2012-03-02 11:29:54 -0500 (Fri, 02 Mar 2012) | 2 lines Do not set passwords to the empty String if they are null. - This is causing the keystore.private.password property of WSS4J to not work ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
