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/b77bbdc4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b77bbdc4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b77bbdc4 Branch: refs/heads/master Commit: b77bbdc4482bcee499a2e47e57755f0e7a616514 Parents: 4aefaea 2be0649 Author: Andrei Shakirin <[email protected]> Authored: Thu Feb 20 14:12:37 2014 +0100 Committer: Andrei Shakirin <[email protected]> Committed: Thu Feb 20 14:12:37 2014 +0100 ---------------------------------------------------------------------- .../rs/security/xml/XmlSecOutInterceptor.java | 58 +++++++++++++------- .../jaxrs/security/xml/JAXRSXmlSecTest.java | 9 ++- .../systest/jaxrs/security/xml/stax-server.xml | 30 ++++++---- 3 files changed, 61 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
