Author: dkulp Date: Tue Apr 10 18:30:50 2012 New Revision: 1311911 URL: http://svn.apache.org/viewvc?rev=1311911&view=rev Log: Blocking revisions 1310520,1311654,1311893,1311900,1311901 via svn from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1310520 | dkulp | 2012-04-06 14:03:45 -0400 (Fri, 06 Apr 2012) | 2 lines Fix cr/lf issues ........ ........ r1311654 | ay | 2012-04-10 05:24:11 -0400 (Tue, 10 Apr 2012) | 22 lines Blocking revisions 1311644,1311652 via svn from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1311644 | ay | 2012-04-10 10:57:16 +0200 (Tue, 10 Apr 2012) | 9 lines Merged revisions 1311046 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1311046 | ay | 2012-04-08 19:02:09 +0200 (Sun, 08 Apr 2012) | 1 line [CXF-4176] preserve namespace prefixes in Transform feature ........ ........ ........ r1311652 | ay | 2012-04-10 11:21:38 +0200 (Tue, 10 Apr 2012) | 1 line missed some files for 2.5.x merge for CXF-4176 ........ ........ ........ r1311893 | dkulp | 2012-04-10 14:05:12 -0400 (Tue, 10 Apr 2012) | 17 lines Merged revisions 1311423 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1311423 | dkulp | 2012-04-09 16:33:37 -0400 (Mon, 09 Apr 2012) | 9 lines Merged revisions 1311258 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1311258 | dkulp | 2012-04-09 10:31:34 -0400 (Mon, 09 Apr 2012) | 2 lines Update to new Karaf ........ ........ ........ ........ r1311900 | dkulp | 2012-04-10 14:18:20 -0400 (Tue, 10 Apr 2012) | 17 lines Merged revisions 1311837 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1311837 | dkulp | 2012-04-10 12:24:52 -0400 (Tue, 10 Apr 2012) | 9 lines Merged revisions 1311832 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1311832 | dkulp | 2012-04-10 12:20:50 -0400 (Tue, 10 Apr 2012) | 1 line Fix a potential NPE in blueprint configuration ........ ........ ........ ........ r1311901 | dkulp | 2012-04-10 14:18:29 -0400 (Tue, 10 Apr 2012) | 178 lines Blocking revisions 1311216,1311424,1311425,1311426,1311635,1311656,1311719,1311787,1311835,1311836 via svn from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1311216 | sergeyb | 2012-04-09 09:11:49 -0400 (Mon, 09 Apr 2012) | 1 line Removing empty rs/security package from the jaxrs frontend ........ ........ r1311424 | dkulp | 2012-04-09 16:33:43 -0400 (Mon, 09 Apr 2012) | 9 lines Merged revisions 1311408 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1311408 | dkulp | 2012-04-09 16:07:44 -0400 (Mon, 09 Apr 2012) | 2 lines [CXF-4127] Make sure the bus and such is reset on ApplicationRefresh ........ ........ ........ r1311425 | dkulp | 2012-04-09 16:33:49 -0400 (Mon, 09 Apr 2012) | 4 lines Recording revisions 1311258,1311408 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ ........ r1311426 | dkulp | 2012-04-09 16:33:51 -0400 (Mon, 09 Apr 2012) | 53 lines Blocking revisions 1310446,1310575,1310590,1310591,1310592,1310593,1311352,1311362 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1310446 | dkulp | 2012-04-06 12:21:14 -0400 (Fri, 06 Apr 2012) | 2 lines More cr/lf cleanups ........ ........ r1310575 | dkulp | 2012-04-06 16:36:41 -0400 (Fri, 06 Apr 2012) | 3 lines Allow supporting the HTTP Continuations when running with pax-web in OSGi where it's servlet 2.5, but using the Jetty requests ........ ........ r1310590 | gmazza | 2012-04-06 17:11:58 -0400 (Fri, 06 Apr 2012) | 2 lines Proofread README. ........ ........ r1310591 | dkulp | 2012-04-06 17:12:38 -0400 (Fri, 06 Apr 2012) | 2 lines Remove some emtpy directories ........ ........ r1310592 | dkulp | 2012-04-06 17:13:39 -0400 (Fri, 06 Apr 2012) | 2 lines Remove more empty directories ........ ........ r1310593 | dkulp | 2012-04-06 17:14:35 -0400 (Fri, 06 Apr 2012) | 2 lines 2 more empty dirs ........ ........ r1311352 | sergeyb | 2012-04-09 13:36:33 -0400 (Mon, 09 Apr 2012) | 2 lines Updating the all-compatible bundle to require the jaxrs frontend with re-exports ........ ........ r1311362 | dkulp | 2012-04-09 14:11:45 -0400 (Mon, 09 Apr 2012) | 2 lines Fix versions in two poms ........ ........ ........ r1311635 | ay | 2012-04-10 04:37:19 -0400 (Tue, 10 Apr 2012) | 9 lines Merged revisions 1310076 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1310076 | ay | 2012-04-05 23:31:25 +0200 (Thu, 05 Apr 2012) | 1 line [CXF-4084] Http Blueprint (Destination) ........ ........ ........ r1311656 | ay | 2012-04-10 05:25:57 -0400 (Tue, 10 Apr 2012) | 9 lines Blocking revisions 1310028 via svn from https://svn.apache.org/repos/asf/cxf/trunk ........ r1310028 | ay | 2012-04-05 21:33:18 +0200 (Thu, 05 Apr 2012) | 1 line [CXF-4229] Make upgrading the WS-RM's RMTxStore's tables easier ........ ........ ........ r1311719 | sergeyb | 2012-04-10 09:37:57 -0400 (Tue, 10 Apr 2012) | 9 lines Merged revisions 1311716 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1311716 | sergeyb | 2012-04-10 14:30:38 +0100 (Tue, 10 Apr 2012) | 1 line Minor update to JAASAuthenticationFilter to convert SecurityException to 401 ........ ........ ........ r1311787 | owulff | 2012-04-10 11:27:07 -0400 (Tue, 10 Apr 2012) | 1 line [CXF-4212] Support RBAC in JAX-WS WebServiceContext based on received SAML token ........ ........ r1311835 | dkulp | 2012-04-10 12:23:23 -0400 (Tue, 10 Apr 2012) | 4 lines Recording revisions 1311767 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ ........ r1311836 | dkulp | 2012-04-10 12:23:25 -0400 (Tue, 10 Apr 2012) | 35 lines Blocking revisions 1310574,1311210,1311211,1311385,1311388 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1310574 | dkulp | 2012-04-06 16:36:32 -0400 (Fri, 06 Apr 2012) | 3 lines Move all the configuration/jsse stuff into API to resolve the split package issue. ........ ........ r1311210 | coheigea | 2012-04-09 08:33:45 -0400 (Mon, 09 Apr 2012) | 2 lines [CXF-4158] - Add proof-of-possession logic ........ ........ r1311211 | coheigea | 2012-04-09 08:34:04 -0400 (Mon, 09 Apr 2012) | 2 lines Added an initial operation level test for renewing SAML tokens ........ ........ r1311385 | coheigea | 2012-04-09 15:27:19 -0400 (Mon, 09 Apr 2012) | 2 lines [CXF-4158] - Added some more tests ........ ........ r1311388 | coheigea | 2012-04-09 15:27:38 -0400 (Mon, 09 Apr 2012) | 2 lines [CXF-4158] - Removed re-keying stuff from SAMLTokenRenewer ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
