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

Branch: refs/heads/master
Commit: a4e4b8f9b7b3e92a57f3b80b59cdc21a2676182c
Parents: ea23ff8 c2dc0e3
Author: Sergey Beryozkin <sberyoz...@gmail.com>
Authored: Thu Sep 22 17:42:50 2016 +0100
Committer: Sergey Beryozkin <sberyoz...@gmail.com>
Committed: Thu Sep 22 17:42:50 2016 +0100

----------------------------------------------------------------------
 .../features/src/main/resources/features.xml    |  12 +-
 rt/transports/http-jetty/pom.xml                |   1 +
 .../osgi/HTTPJettyTransportActivator.java       |  22 ++--
 rt/transports/http-undertow/pom.xml             |   1 +
 .../osgi/HTTPUndertowTransportActivator.java    |  22 ++--
 .../org/apache/cxf/sts/SignatureProperties.java |   1 +
 .../cxf/systest/ws/x509/SHA512PolicyLoader.java | 117 +++++++++++++++++++
 .../cxf/systest/ws/x509/X509TokenTest.java      |  28 ++++-
 .../cxf/systest/ws/x509/DoubleItX509.wsdl       |  63 ++++++++++
 .../org/apache/cxf/systest/ws/x509/client.xml   |  14 +++
 .../org/apache/cxf/systest/ws/x509/server.xml   |  13 +++
 .../apache/cxf/systest/ws/x509/stax-server.xml  |  14 +++
 12 files changed, 282 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


Reply via email to