This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 0810564 Replacing some deprecated STS calls in CXF
0810564 is described below
commit 0810564ec9d880b19c5fa50f13c07ab5b609164d
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Wed Aug 14 11:25:28 2019 +0100
Replacing some deprecated STS calls in CXF
---
services/sts/src/main/webapp/WEB-INF/data/realms.xml | 4 ++--
.../federation/unknown-subject/src/test/resources/sts/realms.xml | 4 ++--
systests/kerberos/src/test/resources/sts/cxf-transport.xml | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/services/sts/src/main/webapp/WEB-INF/data/realms.xml
b/services/sts/src/main/webapp/WEB-INF/data/realms.xml
index 54e49c1..4731af1 100644
--- a/services/sts/src/main/webapp/WEB-INF/data/realms.xml
+++ b/services/sts/src/main/webapp/WEB-INF/data/realms.xml
@@ -59,14 +59,14 @@
<bean id="realmA" class="org.apache.cxf.sts.token.realm.RealmProperties">
<property name="issuer" value="STS Realm A" />
- <property name="signaturePropertiesFile"
value="stsKeystoreA.properties" />
+ <property name="signatureCryptoProperties"
value="stsKeystoreA.properties" />
<property name="callbackHandlerClass"
value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
</bean>
<bean id="realmB" class="org.apache.cxf.sts.token.realm.RealmProperties">
<property name="issuer" value="STS Realm B" />
- <property name="signaturePropertiesFile"
value="stsKeystoreB.properties" />
+ <property name="signatureCryptoProperties"
value="stsKeystoreB.properties" />
<property name="callbackHandlerClass"
value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
</bean>
diff --git
a/systests/federation/unknown-subject/src/test/resources/sts/realms.xml
b/systests/federation/unknown-subject/src/test/resources/sts/realms.xml
index a34281d..7ffc73e 100644
--- a/systests/federation/unknown-subject/src/test/resources/sts/realms.xml
+++ b/systests/federation/unknown-subject/src/test/resources/sts/realms.xml
@@ -52,14 +52,14 @@
<bean id="realmA" class="org.apache.cxf.sts.token.realm.RealmProperties">
<property name="issuer" value="STS Realm A" />
- <property name="signaturePropertiesFile"
value="stsKeystoreA.properties" />
+ <property name="signatureCryptoProperties"
value="stsKeystoreA.properties" />
<property name="callbackHandlerClass"
value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
</bean>
<bean id="realmB" class="org.apache.cxf.sts.token.realm.RealmProperties">
<property name="issuer" value="STS Realm B" />
- <property name="signaturePropertiesFile"
value="stsKeystoreB.properties" />
+ <property name="signatureCryptoProperties"
value="stsKeystoreB.properties" />
<property name="callbackHandlerClass"
value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
</bean>
diff --git a/systests/kerberos/src/test/resources/sts/cxf-transport.xml
b/systests/kerberos/src/test/resources/sts/cxf-transport.xml
index 851a93d..c582f36 100644
--- a/systests/kerberos/src/test/resources/sts/cxf-transport.xml
+++ b/systests/kerberos/src/test/resources/sts/cxf-transport.xml
@@ -110,16 +110,16 @@
<bean class="org.apache.cxf.sts.token.validator.X509TokenValidator" />
</util:list>
- <bean id="realmA" class="org.apache.cxf.sts.token.realm.SAMLRealm">
+ <bean id="realmA" class="org.apache.cxf.sts.token.realm.RealmProperties">
<property name="issuer" value="STS Realm A" />
- <property name="signaturePropertiesFile"
value="stsKeystoreA.properties" />
+ <property name="signatureCryptoProperties"
value="stsKeystoreA.properties" />
<property name="callbackHandlerClass"
value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
</bean>
- <bean id="realmB" class="org.apache.cxf.sts.token.realm.SAMLRealm">
+ <bean id="realmB" class="org.apache.cxf.sts.token.realm.RealmProperties">
<property name="issuer" value="STS Realm B" />
- <property name="signaturePropertiesFile"
value="stsKeystoreB.properties" />
+ <property name="signatureCryptoProperties"
value="stsKeystoreB.properties" />
<property name="callbackHandlerClass"
value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
</bean>
