Author: dkulp Date: Mon Feb 6 22:20:45 2012 New Revision: 1241220 URL: http://svn.apache.org/viewvc?rev=1241220&view=rev Log: Blocked revisions 1236771,1237718,1238048,1240308,1240363,1241187,1241189,1241193-1241194,1241198,1241200 via svnmerge
................ r1236771 | sergeyb | 2012-01-27 12:24:31 -0500 (Fri, 27 Jan 2012) | 9 lines Merged revisions 1236769 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1236769 | sergeyb | 2012-01-27 17:17:43 +0000 (Fri, 27 Jan 2012) | 1 line Moving the cors code to rs/security/cors subpackage before moving it to the new module ........ ................ r1237718 | sergeyb | 2012-01-30 10:34:22 -0500 (Mon, 30 Jan 2012) | 9 lines Merged revisions 1237715 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1237715 | sergeyb | 2012-01-30 15:26:04 +0000 (Mon, 30 Jan 2012) | 1 line Support for pre-authorized tokens to do with the so called 2-way flow ........ ................ r1238048 | sergeyb | 2012-01-30 17:24:09 -0500 (Mon, 30 Jan 2012) | 9 lines Merged revisions 1238046 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1238046 | sergeyb | 2012-01-30 22:20:02 +0000 (Mon, 30 Jan 2012) | 1 line Minor cleanup in the OAuth code ........ ................ r1240308 | dkulp | 2012-02-03 14:21:29 -0500 (Fri, 03 Feb 2012) | 40 lines Blocked revisions 1236626-1236627,1236720,1236762,1236893,1236896,1236902,1237498,1237584 via svnmerge ........ r1236626 | cschneider | 2012-01-27 05:32:45 -0500 (Fri, 27 Jan 2012) | 1 line CXF-4069 Add a new module for just the JAXB Adapter so people using it have minimal dependencies ........ r1236627 | cschneider | 2012-01-27 05:54:31 -0500 (Fri, 27 Jan 2012) | 1 line CXF-4069 Add a new module for just the JAXB Adapter so people using it have minimal dependencies ........ r1236720 | sergeyb | 2012-01-27 10:40:22 -0500 (Fri, 27 Jan 2012) | 1 line Removing redundant oauth-test module ........ r1236762 | cschneider | 2012-01-27 12:02:22 -0500 (Fri, 27 Jan 2012) | 1 line CXF-4069 Fix for Java 5 ........ r1236893 | dkulp | 2012-01-27 16:20:03 -0500 (Fri, 27 Jan 2012) | 1 line Add ability to start configuring some conduit settings via config:admin ........ r1236896 | dkulp | 2012-01-27 16:30:58 -0500 (Fri, 27 Jan 2012) | 1 line Compile on java5 ........ r1236902 | sergeyb | 2012-01-27 16:49:40 -0500 (Fri, 27 Jan 2012) | 1 line Moving the cors code to the new rs/security/cors module ........ r1237498 | sergeyb | 2012-01-29 17:42:31 -0500 (Sun, 29 Jan 2012) | 1 line [CXF-4076] Removing cxf-rt-bindings-http ........ r1237584 | sergeyb | 2012-01-30 04:53:28 -0500 (Mon, 30 Jan 2012) | 1 line [CXF-4076] Removing one more test from systests/transports ........ ................ r1240363 | dkulp | 2012-02-03 16:57:19 -0500 (Fri, 03 Feb 2012) | 9 lines Merged revisions 1240357 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1240357 | dkulp | 2012-02-03 16:54:45 -0500 (Fri, 03 Feb 2012) | 1 line [CXF-4068] Make sure wsdlLocation is merged from defaultOptions ........ ................ r1241187 | dkulp | 2012-02-06 16:29:25 -0500 (Mon, 06 Feb 2012) | 10 lines Merged revisions 1238842 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1238842 | dkulp | 2012-01-31 17:40:42 -0500 (Tue, 31 Jan 2012) | 2 lines Fix some minor SONAR issues mostly so I can say I actually accomplished something useful today. :-) (or :-( ) ........ ................ r1241189 | dkulp | 2012-02-06 16:32:10 -0500 (Mon, 06 Feb 2012) | 9 lines Merged revisions 1240059 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1240059 | cschneider | 2012-02-03 05:05:04 -0500 (Fri, 03 Feb 2012) | 1 line CXF-4080 Removing basicAuthSupplier element from conduit schema as it did not work and was deprecated since some time ........ ................ r1241193 | dkulp | 2012-02-06 16:36:07 -0500 (Mon, 06 Feb 2012) | 9 lines Merged revisions 1240200 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1240200 | dkulp | 2012-02-03 09:51:23 -0500 (Fri, 03 Feb 2012) | 1 line Properly restolve the raw types. ........ ................ r1241194 | dkulp | 2012-02-06 16:38:13 -0500 (Mon, 06 Feb 2012) | 10 lines Merged revisions 1240212 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1240212 | dkulp | 2012-02-03 10:23:37 -0500 (Fri, 03 Feb 2012) | 2 lines Split the namespace handlers into multiple services so that the bundle plugin can generate a correct Export-Service header in the manifest ........ ................ r1241198 | dkulp | 2012-02-06 16:45:01 -0500 (Mon, 06 Feb 2012) | 9 lines Recorded merge of revisions 1236649 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1236649 | coheigea | 2012-01-27 07:23:11 -0500 (Fri, 27 Jan 2012) | 1 line Enforcing that only one Timestamp is allowed per security header ........ ................ r1241200 | dkulp | 2012-02-06 16:46:09 -0500 (Mon, 06 Feb 2012) | 85 lines Blocked revisions 1238349,1238359,1238819,1238852,1239041,1239141,1239192,1239213-1239214,1239229,1239243,1240054,1240196,1240221,1240243,1240249,1240251,1240348,1240982 via svnmerge ........ r1238349 | cschneider | 2012-01-31 04:50:03 -0500 (Tue, 31 Jan 2012) | 1 line Ignore target ........ r1238359 | cschneider | 2012-01-31 05:17:01 -0500 (Tue, 31 Jan 2012) | 1 line CXF-4069 Add a new module for JAX DataTypeAdapter and the ToString classes so generated code does not have to depend on cxf ........ r1238819 | dkulp | 2012-01-31 16:28:45 -0500 (Tue, 31 Jan 2012) | 3 lines Try to write an initial pax-exam test, but it's failing completely. Just committing it so Christian or JB can take a look and help me figure out what is going on. ........ r1238852 | sergeyb | 2012-01-31 18:02:47 -0500 (Tue, 31 Jan 2012) | 1 line [CXF-4079] Moving many optional providers to rt/rs/extensions/providers ........ r1239041 | cschneider | 2012-02-01 05:30:19 -0500 (Wed, 01 Feb 2012) | 1 line CXF-4081 Move gzip feature to core ........ r1239141 | ningjiang | 2012-02-01 09:12:12 -0500 (Wed, 01 Feb 2012) | 1 line Fixed the build error of the logbrowser example ........ r1239192 | sergeyb | 2012-02-01 11:14:23 -0500 (Wed, 01 Feb 2012) | 1 line Fixing CodeGeneratorProviderTest on 1.5 ........ r1239213 | dkulp | 2012-02-01 12:16:22 -0500 (Wed, 01 Feb 2012) | 1 line Update OSGi http-conduit config stuff to support TLS stuff ........ r1239214 | dkulp | 2012-02-01 12:16:32 -0500 (Wed, 01 Feb 2012) | 1 line Add ProbeBuilder back in. ........ r1239229 | sergeyb | 2012-02-01 12:39:38 -0500 (Wed, 01 Feb 2012) | 1 line [CXF-4079] Finalizing the package updates for optional providers for now ........ r1239243 | dkulp | 2012-02-01 13:05:06 -0500 (Wed, 01 Feb 2012) | 1 line Fix checkstyle issues ........ r1240054 | cschneider | 2012-02-03 04:57:16 -0500 (Fri, 03 Feb 2012) | 1 line CXF-3352 Move clustering support into a separate module ........ r1240196 | dkulp | 2012-02-03 09:48:42 -0500 (Fri, 03 Feb 2012) | 1 line Remove a bunch of printlns ........ r1240221 | cschneider | 2012-02-03 10:48:34 -0500 (Fri, 03 Feb 2012) | 1 line CXF-3352 Suppress deprecation warnings in the tests ........ r1240243 | sergeyb | 2012-02-03 11:54:37 -0500 (Fri, 03 Feb 2012) | 1 line [CXF-4087] Moving SourceGenerator to tools/wadlto, dropping CodeGeneratorProvider ........ r1240249 | sergeyb | 2012-02-03 12:15:03 -0500 (Fri, 03 Feb 2012) | 1 line [CXF-3352] And dropping the redundant JAX-RS FailoverFeature class ........ r1240251 | dkulp | 2012-02-03 12:24:02 -0500 (Fri, 03 Feb 2012) | 1 line Remove some unneeded SupressWarnings ........ r1240348 | dkulp | 2012-02-03 16:33:07 -0500 (Fri, 03 Feb 2012) | 4 lines [CXF-4073] Support for mulitple policy interceptor providers per assertion Modified patch from Andrei Shakirin applied ........ r1240982 | sergeyb | 2012-02-06 06:33:39 -0500 (Mon, 06 Feb 2012) | 1 line Updating the KEYS file ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
