Author: dkulp Date: Tue Oct 4 14:51:51 2011 New Revision: 1178818 URL: http://svn.apache.org/viewvc?rev=1178818&view=rev Log: Blocked revisions 1178490,1178547,1178782-1178783,1178797,1178814-1178815 via svnmerge
................ r1178490 | dkulp | 2011-10-03 14:15:40 -0400 (Mon, 03 Oct 2011) | 9 lines Merged revisions 1178485 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1178485 | dkulp | 2011-10-03 14:11:20 -0400 (Mon, 03 Oct 2011) | 1 line Fix test case with comparison to new error message ........ ................ r1178547 | dkulp | 2011-10-03 15:56:11 -0400 (Mon, 03 Oct 2011) | 9 lines Merged revisions 1178507 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1178507 | gmazza | 2011-10-03 14:36:36 -0400 (Mon, 03 Oct 2011) | 2 lines typo ........ ................ r1178782 | dkulp | 2011-10-04 09:47:28 -0400 (Tue, 04 Oct 2011) | 16 lines Recorded merge of revisions 1178763 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1178763 | coheigea | 2011-10-04 08:00:43 -0400 (Tue, 04 Oct 2011) | 8 lines Added the ability to use the STSClient in an intermediary. - There is a new configuration property to disable storing issued tokens per exchange - Caching is enabled for OnBehalfOf or ActAs tokens Conflicts: rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java ........ ................ r1178783 | dkulp | 2011-10-04 09:48:08 -0400 (Tue, 04 Oct 2011) | 12 lines Blocked revisions 1178771,1178774 via svnmerge ........ r1178771 | sergeyb | 2011-10-04 08:57:34 -0400 (Tue, 04 Oct 2011) | 1 line [CXF-3844] Adding jaxrs saml authorization test ........ r1178774 | sergeyb | 2011-10-04 09:09:30 -0400 (Tue, 04 Oct 2011) | 1 line [CXF-3844] Simplifying the interceptor wrapper ........ ................ r1178797 | dkulp | 2011-10-04 10:02:08 -0400 (Tue, 04 Oct 2011) | 2 lines Update release notes for 2.4.3 ................ r1178814 | dkulp | 2011-10-04 10:31:18 -0400 (Tue, 04 Oct 2011) | 9 lines Merged revisions 1178813 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1178813 | dkulp | 2011-10-04 10:30:02 -0400 (Tue, 04 Oct 2011) | 2 lines Add svn:ignores ........ ................ r1178815 | dkulp | 2011-10-04 10:31:36 -0400 (Tue, 04 Oct 2011) | 8 lines Blocked revisions 1178798 via svnmerge ........ r1178798 | sergeyb | 2011-10-04 10:02:14 -0400 (Tue, 04 Oct 2011) | 1 line [CXF-3844] Fixing JAXRSSimpleSecurityTest ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
