You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/10/05 23:40:48 UTC
[3/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf-fediz
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf-fediz
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d9d36f2c
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d9d36f2c
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d9d36f2c
Branch: refs/heads/master
Commit: d9d36f2c4476e3362ebb9fbccb081389edb7e237
Parents: d9ed77f 308c39f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Sat Oct 4 23:42:28 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Sat Oct 4 23:42:28 2014 +0100
----------------------------------------------------------------------
services/idp/README.txt | 20 +++++++++++
.../WEB-INF/federation-validate-request.xml | 15 ++++++--
services/idp/src/main/webapp/WEB-INF/web.xml | 10 ++++++
.../src/main/resources/stsEncryption.properties | 5 +++
services/sts/src/main/resources/stsencrypt.jks | Bin 0 -> 32 bytes
.../src/main/webapp/WEB-INF/cxf-transport.xml | 35 +++++++++++++++----
6 files changed, 75 insertions(+), 10 deletions(-)
----------------------------------------------------------------------