cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsosno...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Date Sun, 23 Feb 2014 11:58:55 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1bc07311
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1bc07311
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1bc07311

Branch: refs/heads/master
Commit: 1bc073112eec9b6c34f1e88e56f41eb2919fa4ee
Parents: c03492d 03a0a7e
Author: dsosnoski <dsosnoski@apache.org>
Authored: Mon Feb 24 00:57:37 2014 +1300
Committer: dsosnoski <dsosnoski@apache.org>
Committed: Mon Feb 24 00:57:37 2014 +1300

----------------------------------------------------------------------
 bin/DoMerges.java                               | 822 +++++--------------
 .../DelegatingAuthenticationInterceptor.java    |  67 ++
 parent/pom.xml                                  |   6 +-
 .../jaxrs/interceptor/JAXRSInInterceptor.java   |   1 +
 .../cxf/jaxrs/provider/JAXBElementProvider.java |   6 +
 rt/management-web/pom.xml                       |   6 +-
 .../bootstrapping/SimpleXMLSettingsStorage.java |   1 -
 .../xml/AbstractXmlSecOutInterceptor.java       |   3 +
 .../rs/security/xml/XmlSecOutInterceptor.java   |  63 +-
 .../rs/security/xml/XmlSigOutInterceptor.java   |  12 +-
 .../selector/BaseAlternativeSelector.java       |  28 +-
 ...ureConversationTokenInterceptorProvider.java |   9 +
 .../ws/security/trust/AbstractSTSClient.java    |  17 +-
 .../cxf/ws/security/wss4j/WSS4JUtils.java       |  10 +-
 .../sts/symmetric/SymmetricBindingTest.java     |  43 +
 .../jaxrs/security/xml/JAXRSXmlSecTest.java     |   5 -
 .../systest/jaxrs/security/xml/stax-server.xml  |  30 +-
 .../cxf/systest/ws/x509/X509TokenTest.java      |  16 +-
 18 files changed, 450 insertions(+), 695 deletions(-)
----------------------------------------------------------------------



Mime
View raw message