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 2016/10/13 09:36:33 UTC
cxf-fediz git commit: Take SamlRealmCodec from fediz-sts.xml
Repository: cxf-fediz
Updated Branches:
refs/heads/master c4ca0c083 -> f260b413c
Take SamlRealmCodec from fediz-sts.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/f260b413
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/f260b413
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/f260b413
Branch: refs/heads/master
Commit: f260b413ca7b565340535b1a899a9351d86aca37
Parents: c4ca0c0
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Oct 13 10:36:18 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 13 10:36:18 2016 +0100
----------------------------------------------------------------------
services/sts/src/main/webapp/WEB-INF/cxf-transport.xml | 4 ++++
services/sts/src/main/webapp/WEB-INF/fediz-sts.xml | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f260b413/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
index c06fed8..524a51e 100644
--- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
+++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
@@ -56,12 +56,16 @@
<property name="realmMap" ref="realms" />
</bean>
+ <bean id="samlRealmCodec"
+ class="org.apache.cxf.fediz.service.sts.realms.SamlRealmCodec" />
+
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
<property name="callbackHandlerClass" value="${callback.handler}" />
<property name="issuer" value="${issuer}" />
<property name="realmParser" ref="customRealmParser" />
<property name="signatureCryptoProperties" value="${signature.properties}" />
<property name="relationships" ref="relationships" />
+ <property name="samlRealmCodec" ref="samlRealmCodec" />
</bean>
<jaxws:endpoint id="transportSTSRealmA" implementor="#transportSTSProviderBean"
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f260b413/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml b/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
index 3e3ae36..dece37e 100644
--- a/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
+++ b/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
@@ -106,12 +106,8 @@
<property name="claimHandlers" ref="claimHandlerList" />
</bean>
- <bean id="samlRealmCodec"
- class="org.apache.cxf.fediz.service.sts.realms.SamlRealmCodec" />
-
<bean id="transportSamlTokenValidator"
class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- <property name="samlRealmCodec" ref="samlRealmCodec" />
</bean>
<util:list id="transportServices">