You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by se...@apache.org on 2015/07/01 18:53:13 UTC

[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

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/5d5f5e34
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d5f5e34
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d5f5e34

Branch: refs/heads/master
Commit: 5d5f5e34be147bc8f74286ee8e161c42abb2c372
Parents: d58606e b1c7e0e
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Jul 1 17:52:54 2015 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Jul 1 17:52:54 2015 +0100

----------------------------------------------------------------------
 .../apache/cxf/common/security/SimpleGroup.java |  1 +
 .../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 31 ++++++++++++----
 .../cxf/jaxrs/provider/XSLTJaxbProvider.java    |  2 ++
 .../security/KerberosAuthenticationFilter.java  |  1 +
 .../bootstrapping/SimpleXMLSettingsStorage.java |  9 ++++-
 .../jose/jaxrs/JwtAuthenticationFilter.java     |  1 +
 .../saml/authorization/SubjectPrincipal.java    |  2 ++
 .../JettyHTTPServerEngineFactoryHolder.java     | 13 +++----
 .../NettyHttpServerEngineFactoryHolder.java     | 13 +++----
 .../ws/security/wss4j/WSS4JOutInterceptor.java  | 38 ++++++++------------
 .../org/apache/cxf/systest/ws/mtom/client.xml   |  4 ---
 11 files changed, 62 insertions(+), 53 deletions(-)
----------------------------------------------------------------------