Author: dkulp Date: Fri Feb 17 15:52:13 2012 New Revision: 1245626 URL: http://svn.apache.org/viewvc?rev=1245626&view=rev Log: Blocking revisions 1241212,1242811,1242833,1245594 via svn from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1241212 | dkulp | 2012-02-06 17:09:36 -0500 (Mon, 06 Feb 2012) | 16 lines Merged revisions 1240307 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1240307 | dkulp | 2012-02-03 14:19:57 -0500 (Fri, 03 Feb 2012) | 9 lines Merged revisions 1236786 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1236786 | dkulp | 2012-01-27 12:59:13 -0500 (Fri, 27 Jan 2012) | 1 line Update to asm imports to include 4.0 which provides support for Java7 ........ ................ ........ ........ r1242811 | coheigea | 2012-02-10 10:12:29 -0500 (Fri, 10 Feb 2012) | 5 lines [CXF-4052] - Crypto cache issues and the PolicyBasedWSS4JInInterceptor used as a singleton Conflicts: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java ........ ........ r1242833 | coheigea | 2012-02-10 11:05:04 -0500 (Fri, 10 Feb 2012) | 2 lines [CXF-4092] - Confusing error message "No initiator token id" in AssymetricBindingHandler - Patch applied, thanks ........ ........ r1245594 | dkulp | 2012-02-17 10:04:12 -0500 (Fri, 17 Feb 2012) | 17 lines Merged revisions 1245569 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1245569 | dkulp | 2012-02-17 09:31:06 -0500 (Fri, 17 Feb 2012) | 9 lines Merged revisions 1245567 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1245567 | dkulp | 2012-02-17 09:25:59 -0500 (Fri, 17 Feb 2012) | 2 lines New version of PMD fixes the problem we had with 2.7 ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
