You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/02/15 16:51:21 UTC
svn commit: r1244550 - /cxf/branches/2.4.x-fixes/
Author: dkulp
Date: Wed Feb 15 15:51:20 2012
New Revision: 1244550
URL: http://svn.apache.org/viewvc?rev=1244550&view=rev
Log:
Blocking revisions 1244332,1244333,1244456,1244457,1244470,1244477,1244540,1244541 via svn from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1244332 | dkulp | 2012-02-14 22:48:33 -0500 (Tue, 14 Feb 2012) | 9 lines
Merged revisions 1242831 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1242831 | asoldano | 2012-02-10 10:58:09 -0500 (Fri, 10 Feb 2012) | 2 lines
[CXF-4030] Add option for setting in-memory threshold for dealing with messages caching in logging interceptors
........
........
........
r1244333 | dkulp | 2012-02-14 22:48:42 -0500 (Tue, 14 Feb 2012) | 10 lines
Recording revisions 1242831 via git from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1242831 | asoldano | 2012-02-10 10:58:09 -0500 (Fri, 10 Feb 2012) | 2 lines
[CXF-4030] Add option for setting in-memory threshold for dealing with messages caching in logging interceptors
........
........
........
r1244456 | coheigea | 2012-02-15 07:19:44 -0500 (Wed, 15 Feb 2012) | 6 lines
Adding stricter SecurityPolicy parsing
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
........
........
r1244457 | coheigea | 2012-02-15 07:20:22 -0500 (Wed, 15 Feb 2012) | 1 line
Fixing incorrect HttpsToken assertions in STS wsdls
........
........
r1244470 | coheigea | 2012-02-15 08:03:37 -0500 (Wed, 15 Feb 2012) | 1 line
Don't insist on an AlgorithmSuite for WS-SP 1.1
........
........
r1244477 | coheigea | 2012-02-15 08:28:08 -0500 (Wed, 15 Feb 2012) | 2 lines
Reverting last two commits
........
........
r1244540 | dkulp | 2012-02-15 10:34:35 -0500 (Wed, 15 Feb 2012) | 10 lines
Recording revisions 1244529 via git from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1244529 | dkulp | 2012-02-15 10:19:16 -0500 (Wed, 15 Feb 2012) | 2 lines
Fix compile failure with non-eclipse compiler
........
........
........
r1244541 | dkulp | 2012-02-15 10:34:37 -0500 (Wed, 15 Feb 2012) | 42 lines
Blocking revisions 1244331,1244451,1244452,1244469,1244508,1244530 via git from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1244331 | dkulp | 2012-02-14 22:18:35 -0500 (Tue, 14 Feb 2012) | 4 lines
New version of DoMerges that no longer needs svnmerge.py as it handles
it all internally. Also works within a git clone instead of svn
checkout.
........
........
r1244451 | coheigea | 2012-02-15 06:53:25 -0500 (Wed, 15 Feb 2012) | 2 lines
Adding stricter SecurityPolicy parsing
........
........
r1244452 | coheigea | 2012-02-15 06:54:02 -0500 (Wed, 15 Feb 2012) | 2 lines
Fixing incorrect HttpsToken assertions in STS wsdls
........
........
r1244469 | coheigea | 2012-02-15 08:03:06 -0500 (Wed, 15 Feb 2012) | 2 lines
Don't insist on an AlgorithmSuite for WS-SP 1.1
........
........
r1244508 | dkulp | 2012-02-15 09:44:13 -0500 (Wed, 15 Feb 2012) | 2 lines
Minor updates to work better with git and svn
........
........
r1244530 | dkulp | 2012-02-15 10:22:35 -0500 (Wed, 15 Feb 2012) | 2 lines
Don't need the +1 as cur contains the right value now
........
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.