Author: dkulp Date: Mon Nov 14 17:18:16 2011 New Revision: 1201800 URL: http://svn.apache.org/viewvc?rev=1201800&view=rev Log: Blocked revisions 1196134,1196470,1196708,1196733-1196734,1196906,1196931,1197023,1197032,1197050,1198171,1198187,1198189,1198215 via svnmerge
................ r1196134 | coheigea | 2011-11-01 13:06:42 -0400 (Tue, 01 Nov 2011) | 1 line [CXF-3225] - Add support for saml tokens in sp:InitiatorToken ................ r1196470 | ffang | 2011-11-02 02:28:35 -0400 (Wed, 02 Nov 2011) | 9 lines Merged revisions 1196467 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1196467 | ffang | 2011-11-02 14:23:34 +0800 (?\228?\184?\137, 02 11 2011) | 1 line [CXF-3892]upgrade to servicemix specs 1.9.0 ........ ................ r1196708 | coheigea | 2011-11-02 13:20:15 -0400 (Wed, 02 Nov 2011) | 2 lines Added support to the SymmetricBinding for the ProtectTokens policy for X509Tokens. - Added 2x system tests ................ r1196733 | gmazza | 2011-11-02 14:20:07 -0400 (Wed, 02 Nov 2011) | 9 lines Merged revisions 1196705 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1196705 | gmazza | 2011-11-02 13:17:18 -0400 (Wed, 02 Nov 2011) | 1 line Implemented servlet deployment option for wsdl_first example ........ ................ r1196734 | gmazza | 2011-11-02 14:22:02 -0400 (Wed, 02 Nov 2011) | 9 lines Merged revisions 1196711 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1196711 | gmazza | 2011-11-02 13:23:53 -0400 (Wed, 02 Nov 2011) | 1 line Rearranged files as part of new servlet deployment option ........ ................ r1196906 | ffang | 2011-11-02 21:04:57 -0400 (Wed, 02 Nov 2011) | 1 line Ignore a test that is failing due to a missing file ................ r1196931 | ffang | 2011-11-02 23:45:05 -0400 (Wed, 02 Nov 2011) | 1 line update release notes ................ r1197023 | ffang | 2011-11-03 05:38:18 -0400 (Thu, 03 Nov 2011) | 1 line [maven-release-plugin] prepare release cxf-2.4.4 ................ r1197032 | ffang | 2011-11-03 05:49:54 -0400 (Thu, 03 Nov 2011) | 1 line [maven-release-plugin] prepare for next development iteration ................ r1197050 | sergeyb | 2011-11-03 06:23:29 -0400 (Thu, 03 Nov 2011) | 9 lines Merged revisions 1197048 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1197048 | sergeyb | 2011-11-03 10:19:58 +0000 (Thu, 03 Nov 2011) | 1 line Adding a missing file, sorry ........ ................ r1198171 | gmazza | 2011-11-06 02:25:12 -0500 (Sun, 06 Nov 2011) | 1 line wrong version number used during merge. ................ r1198187 | gmazza | 2011-11-06 02:34:41 -0500 (Sun, 06 Nov 2011) | 2 lines Instructions added for WAR deployment. ................ r1198189 | gmazza | 2011-11-06 02:35:39 -0500 (Sun, 06 Nov 2011) | 2 lines WAR deployment option added to intro Java-first example. ................ r1198215 | gmazza | 2011-11-06 02:53:41 -0500 (Sun, 06 Nov 2011) | 21 lines Recorded merge of revisions 1198145,1198151,1198193,1198202 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1198145 | gmazza | 2011-11-06 02:07:30 -0500 (Sun, 06 Nov 2011) | 1 line Provided WAR deployment option for intro java-first sample ........ r1198151 | gmazza | 2011-11-06 02:10:05 -0500 (Sun, 06 Nov 2011) | 2 lines New webapp directory for WAR deployment ........ r1198193 | gmazza | 2011-11-06 02:37:34 -0500 (Sun, 06 Nov 2011) | 1 line Adding webapp folder for Java-first sample (updated wrong directory last time) ........ r1198202 | gmazza | 2011-11-06 02:42:53 -0500 (Sun, 06 Nov 2011) | 1 line Reverted previous change; updated wrong sample. ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
