Author: dkulp Date: Mon Jan 23 20:07:57 2012 New Revision: 1234965 URL: http://svn.apache.org/viewvc?rev=1234965&view=rev Log: Blocked revisions 1233491,1233496,1233538,1233540,1233572,1233586,1233588,1233876,1233912,1233914,1233942-1233943,1233960,1233962,1233966,1233988,1233990,1234064,1234635,1234741,1234757,1234759,1234892,1234961 via svnmerge
................ r1233491 | sergeyb | 2012-01-19 12:29:40 -0500 (Thu, 19 Jan 2012) | 9 lines Merged revisions 1233478 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1233478 | sergeyb | 2012-01-19 17:16:12 +0000 (Thu, 19 Jan 2012) | 1 line [CXF-4047] OAuthContext needs to provide an access to OAuthPermissions ........ ................ r1233496 | dkulp | 2012-01-19 12:33:43 -0500 (Thu, 19 Jan 2012) | 2 lines Update release notes ................ r1233538 | dkulp | 2012-01-19 14:11:27 -0500 (Thu, 19 Jan 2012) | 1 line [maven-release-plugin] prepare release cxf-2.5.2 ................ r1233540 | dkulp | 2012-01-19 14:12:22 -0500 (Thu, 19 Jan 2012) | 1 line [maven-release-plugin] prepare for next development iteration ................ r1233572 | dkulp | 2012-01-19 16:15:35 -0500 (Thu, 19 Jan 2012) | 2 lines Fix the scm locations so the release will work ................ r1233586 | dkulp | 2012-01-19 16:49:02 -0500 (Thu, 19 Jan 2012) | 1 line [maven-release-plugin] prepare release cxf-2.5.2 ................ r1233588 | dkulp | 2012-01-19 16:49:49 -0500 (Thu, 19 Jan 2012) | 1 line [maven-release-plugin] prepare for next development iteration ................ r1233876 | sergeyb | 2012-01-20 06:35:20 -0500 (Fri, 20 Jan 2012) | 9 lines Merged revisions 1233875 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1233875 | sergeyb | 2012-01-20 11:31:19 +0000 (Fri, 20 Jan 2012) | 1 line Minor updates to the cors package.html ........ ................ r1233912 | cschneider | 2012-01-20 08:57:02 -0500 (Fri, 20 Jan 2012) | 1 line CXF-4050 Fix Activator name ................ r1233914 | cschneider | 2012-01-20 09:04:58 -0500 (Fri, 20 Jan 2012) | 1 line Fixed version number ................ r1233942 | dkulp | 2012-01-20 10:10:00 -0500 (Fri, 20 Jan 2012) | 9 lines Merged revisions 1233940 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1233940 | dkulp | 2012-01-20 10:05:02 -0500 (Fri, 20 Jan 2012) | 1 line Update some poms so the versions will resolve after a release ........ ................ r1233943 | dkulp | 2012-01-20 10:10:32 -0500 (Fri, 20 Jan 2012) | 24 lines Blocked revisions 1233500,1233797,1233801,1233822,1233834 via svnmerge ........ r1233500 | dkulp | 2012-01-19 12:50:06 -0500 (Thu, 19 Jan 2012) | 1 line Fix checkstyle issues ........ r1233797 | cschneider | 2012-01-20 02:49:56 -0500 (Fri, 20 Jan 2012) | 1 line CXF-4048 Make cxf-rt-indings-soap independent of cxf-tools-common ........ r1233801 | cschneider | 2012-01-20 02:59:40 -0500 (Fri, 20 Jan 2012) | 1 line CXF-4048 Make cxf-rt-indings-soap independent of cxf-tools-common. Add deps for java 1.5 ........ r1233822 | cschneider | 2012-01-20 04:17:11 -0500 (Fri, 20 Jan 2012) | 1 line CXF-4048 Commenting out invoker to make build work. Will have to investigate this ........ r1233834 | cschneider | 2012-01-20 04:40:31 -0500 (Fri, 20 Jan 2012) | 1 line CXF-4032 Making http conduit and destination independent of ws policy ........ ................ r1233960 | dkulp | 2012-01-20 10:33:29 -0500 (Fri, 20 Jan 2012) | 2 lines Fix compile failure ................ r1233962 | dkulp | 2012-01-20 10:36:13 -0500 (Fri, 20 Jan 2012) | 10 lines Merged revisions 1233959 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1233959 | dkulp | 2012-01-20 10:32:12 -0500 (Fri, 20 Jan 2012) | 2 lines Remove oauth stuff.. Need to find a way to make them buildable without actually running them.: ........ ................ r1233966 | dkulp | 2012-01-20 10:40:24 -0500 (Fri, 20 Jan 2012) | 2 lines Try to get release:prepare working ................ r1233988 | dkulp | 2012-01-20 11:27:04 -0500 (Fri, 20 Jan 2012) | 1 line [maven-release-plugin] prepare release cxf-2.5.2 ................ r1233990 | dkulp | 2012-01-20 11:28:01 -0500 (Fri, 20 Jan 2012) | 1 line [maven-release-plugin] prepare for next development iteration ................ r1234064 | coheigea | 2012-01-20 13:51:24 -0500 (Fri, 20 Jan 2012) | 1 line Updating RS-Security code to work with Santuario 1.5 ................ r1234635 | sergeyb | 2012-01-22 17:19:39 -0500 (Sun, 22 Jan 2012) | 9 lines Merged revisions 1234634 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1234634 | sergeyb | 2012-01-22 22:12:29 +0000 (Sun, 22 Jan 2012) | 1 line [CXF-4051] Fixes to do with supporting OAuth scopes ........ ................ r1234741 | sergeyb | 2012-01-23 06:02:44 -0500 (Mon, 23 Jan 2012) | 9 lines Merged revisions 1234739 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1234739 | sergeyb | 2012-01-23 10:59:44 +0000 (Mon, 23 Jan 2012) | 1 line [CXF-4051] Removing redundant OAuthDataProvider.getPermissionsInfo ........ ................ r1234757 | sergeyb | 2012-01-23 07:03:29 -0500 (Mon, 23 Jan 2012) | 9 lines Merged revisions 1234756 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1234756 | sergeyb | 2012-01-23 12:01:48 +0000 (Mon, 23 Jan 2012) | 1 line [CXF-4051] And making the AccessToken registration more flexible ........ ................ r1234759 | sergeyb | 2012-01-23 07:07:03 -0500 (Mon, 23 Jan 2012) | 9 lines Merged revisions 1234758 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1234758 | sergeyb | 2012-01-23 12:06:09 +0000 (Mon, 23 Jan 2012) | 1 line [CXF-4051] Adding a missing file ........ ................ r1234892 | ay | 2012-01-23 11:46:42 -0500 (Mon, 23 Jan 2012) | 8 lines Blocked revisions 1234889 via svnmerge ........ r1234889 | ay | 2012-01-23 17:43:07 +0100 (Mon, 23 Jan 2012) | 1 line fixed samples' missing spring dependency ........ ................ r1234961 | dkulp | 2012-01-23 15:01:16 -0500 (Mon, 23 Jan 2012) | 9 lines Recorded merge of revisions 1234069 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1234069 | coheigea | 2012-01-20 13:54:33 -0500 (Fri, 20 Jan 2012) | 1 line Updating RS-Security code to work with Santuario 1.5 ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
