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 2019/08/14 13:17:22 UTC
[cxf] 02/04: Removing some deprecated STS method calls
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.git
commit 0deb502385473af355a96c20eea624a812addcd2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Aug 14 11:29:34 2019 +0100
Removing some deprecated STS method calls
---
.../org/apache/cxf/sts/StaticSTSProperties.java | 18 --------------
.../org/apache/cxf/sts/event/STSFailureEvent.java | 27 ---------------------
.../cxf/sts/token/realm/RealmProperties.java | 9 -------
.../org/apache/cxf/sts/token/realm/SAMLRealm.java | 28 ----------------------
.../sts/token/provider/SAMLProviderRealmTest.java | 6 ++---
.../cxf/systest/sts/asymmetric_encr/cxf-sts.xml | 4 ++--
.../systest/sts/asymmetric_encr/stax-cxf-sts.xml | 4 ++--
.../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 4 ++--
.../apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 4 ++--
.../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 2 +-
.../cxf/systest/sts/custom/cxf-sts-common.xml | 4 ++--
.../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 4 ++--
.../sts/defaultstsprovider/cxf-sts-common.xml | 4 ++--
.../cxf/systest/sts/deployment/cxf-sts-common.xml | 4 ++--
.../systest/sts/distributed_caching/cxf-sts-1.xml | 4 ++--
.../cxf/systest/sts/realms/cxf-sts-saml1.xml | 2 +-
.../cxf/systest/sts/realms/cxf-sts-saml2.xml | 2 +-
.../apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 4 ++--
.../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 4 ++--
.../apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 4 ++--
.../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 4 ++--
.../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 4 ++--
.../cxf/systest/sts/sts_sender_vouches/cxf-sts.xml | 4 ++--
.../sts/sts_sender_vouches/stax-cxf-sts.xml | 4 ++--
.../systest/sts/delegation/cxf-sts-transport.xml | 4 ++--
.../cxf/systest/sts/deployment/sts/cxf-sts.xml | 4 ++--
.../apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 4 ++--
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
29 files changed, 46 insertions(+), 128 deletions(-)
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
index c8d9856..1c1db1a 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/StaticSTSProperties.java
@@ -166,15 +166,6 @@ public class StaticSTSProperties implements STSPropertiesMBean {
}
/**
- * Set the String corresponding to the signature Properties class
- * @param signaturePropertiesFile the String corresponding to the signature properties file
- */
- @Deprecated
- public void setSignaturePropertiesFile(String signaturePropertiesFile) {
- setSignatureCryptoProperties(signaturePropertiesFile);
- }
-
- /**
* Set the Object corresponding to the signature Properties class. It can be a String
* corresponding to a filename, a Properties object, or a URL.
* @param signatureCryptoProperties the object corresponding to the signature properties
@@ -226,15 +217,6 @@ public class StaticSTSProperties implements STSPropertiesMBean {
}
/**
- * Set the String corresponding to the encryption Properties class
- * @param signaturePropertiesFile the String corresponding to the encryption properties file
- */
- @Deprecated
- public void setEncryptionPropertiesFile(String encryptionPropertiesFile) {
- setEncryptionCryptoProperties(encryptionPropertiesFile);
- }
-
- /**
* Set the Object corresponding to the encryption Properties class. It can be a String
* corresponding to a filename, a Properties object, or a URL.
* @param encryptionCryptoProperties the object corresponding to the encryption properties
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/STSFailureEvent.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/STSFailureEvent.java
deleted file mode 100644
index 2373fea..0000000
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/STSFailureEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.sts.event;
-
-@Deprecated
-public interface STSFailureEvent {
-
- Exception getException();
-
-}
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
index ae6de64..652d2eb 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RealmProperties.java
@@ -107,15 +107,6 @@ public class RealmProperties {
}
/**
- * Set the String corresponding to the signature Properties class
- * @param signaturePropertiesFile the String corresponding to the signature properties file
- */
- @Deprecated
- public void setSignaturePropertiesFile(String signaturePropertiesFile) {
- setSignatureCryptoProperties(signaturePropertiesFile);
- }
-
- /**
* Set the Object corresponding to the signature Properties class. It can be a String
* corresponding to a filename, a Properties object, or a URL.
* @param signatureCryptoProperties the object corresponding to the signature properties
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
deleted file mode 100644
index 0bdab64..0000000
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.sts.token.realm;
-
-/**
- * Use RealmProperties instead
- */
-@Deprecated
-public class SAMLRealm extends RealmProperties {
-
-}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
index b063ace..716fc09 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
@@ -120,12 +120,12 @@ public class SAMLProviderRealmTest {
providerParameters.setRealm("A");
// Create Realms
- Map<String, org.apache.cxf.sts.token.realm.SAMLRealm> samlRealms =
+ Map<String, org.apache.cxf.sts.token.realm.RealmProperties> samlRealms =
new HashMap<>();
- org.apache.cxf.sts.token.realm.SAMLRealm samlRealm = new org.apache.cxf.sts.token.realm.SAMLRealm();
+ org.apache.cxf.sts.token.realm.RealmProperties samlRealm = new org.apache.cxf.sts.token.realm.RealmProperties();
samlRealm.setIssuer("A-Issuer");
samlRealms.put("A", samlRealm);
- samlRealm = new org.apache.cxf.sts.token.realm.SAMLRealm();
+ samlRealm = new org.apache.cxf.sts.token.realm.RealmProperties();
samlRealm.setIssuer("B-Issuer");
samlRealms.put("B", samlRealm);
((SAMLTokenProvider)samlTokenProvider).setRealmMap(samlRealms);
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
index 46971fa..e627566 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
@@ -53,10 +53,10 @@
<property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
</bean>
<bean id="x509STSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="useReqSigCert"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
index 74225eb..9bf5b39 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
@@ -53,10 +53,10 @@
<property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
</bean>
<bean id="x509STSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="useReqSigCert"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
index f70cd9d..1794c60 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
@@ -97,10 +97,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
index cd656c3..7172bc7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
@@ -97,10 +97,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
index b05d19a..89aa25a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
@@ -65,7 +65,7 @@
</util:list>
<bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser"/>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<property name="issuer" value="a-issuer"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
index d2ea4cf..a5af159 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
@@ -64,7 +64,7 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<property name="issuer" value="b-issuer"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml
index de05349..028dd22 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml
@@ -127,10 +127,10 @@
<value>https://localhost:(\d)*/doubleit/services/doubleit.*</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="${signature.properties}"/>
+ <property name="signatureCryptoProperties" value="${signature.properties}"/>
<property name="signatureUsername" value="${signature.username}"/>
<property name="callbackHandlerClass" value="${callback.handler}"/>
- <property name="encryptionPropertiesFile" value="${encryption.properties}"/>
+ <property name="encryptionCryptoProperties" value="${encryption.properties}"/>
<property name="issuer" value="${issuer}"/>
<property name="encryptionUsername" value="${encryption.username}"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
index 991b062..ce04d7f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
@@ -116,10 +116,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml
index 3d55594..a063464 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml
@@ -47,10 +47,10 @@
<value>https://localhost:(\d)*/doubleit/services/doubleit.*</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="${signature.properties}"/>
+ <property name="signatureCryptoProperties" value="${signature.properties}"/>
<property name="signatureUsername" value="${signature.username}"/>
<property name="callbackHandlerClass" value="${callback.handler}"/>
- <property name="encryptionPropertiesFile" value="${encryption.properties}"/>
+ <property name="encryptionCryptoProperties" value="${encryption.properties}"/>
<property name="issuer" value="${issuer}"/>
<property name="encryptionUsername" value="${encryption.username}"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml
index 1f342fd..a25b9e9 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml
@@ -126,10 +126,10 @@
<value>https://localhost:(\d)*/doubleit/services/doubleit.*</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="${signature.properties}"/>
+ <property name="signatureCryptoProperties" value="${signature.properties}"/>
<property name="signatureUsername" value="${signature.username}"/>
<property name="callbackHandlerClass" value="${callback.handler}"/>
- <property name="encryptionPropertiesFile" value="${encryption.properties}"/>
+ <property name="encryptionCryptoProperties" value="${encryption.properties}"/>
<property name="issuer" value="${issuer}"/>
<property name="encryptionUsername" value="${encryption.username}"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
index 665574f..dba4a59 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
@@ -123,10 +123,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="Issuer-A"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
index e39565d..89ace93 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
@@ -78,7 +78,7 @@
</util:list>
<bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser"/>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties"/>
+ <property name="signatureCryptoProperties" value="org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<property name="realmParser" ref="customRealmParser"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
index b4d3329..e42c447 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
@@ -80,7 +80,7 @@
<bean id="customIdentityMapper" class="org.apache.cxf.systest.sts.realms.CustomIdentityMapper"/>
<bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser"/>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<property name="issuer" value="saml2-issuer"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
index 97d885d..2b88278 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
@@ -116,10 +116,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
index 894736a..e1df6f4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
@@ -107,10 +107,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
index 510b976..32b5454 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
@@ -107,10 +107,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
index 8d3f8af..fad2d14 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
@@ -98,10 +98,10 @@
<property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
</bean>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="encryptionProperties" ref="encProperties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
index 831b7c0..f8598c7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
@@ -98,10 +98,10 @@
<property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
</bean>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="encryptionProperties" ref="encProperties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
index b807c19..fdd4d90 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
@@ -51,10 +51,10 @@
</value>
</util:list>
<bean id="utSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
index ce939f7..1f635d4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
@@ -51,10 +51,10 @@
</value>
</util:list>
<bean id="utSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
index 2042372..3268e11 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
@@ -106,10 +106,10 @@
</bean>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
<property name="realmParser" ref="customRealmParser"/>
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
index c121021..0c20be6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
@@ -91,10 +91,10 @@
<bean id="customRealmParser" class="org.apache.cxf.systest.sts.common.UriRealmParser"/>
<bean id="stsProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="${signature.properties}"/>
+ <property name="signatureCryptoProperties" value="${signature.properties}"/>
<property name="signatureUsername" value="${signature.username}"/>
<property name="callbackHandlerClass" value="${callback.handler}"/>
- <property name="encryptionPropertiesFile" value="${encryption.properties}"/>
+ <property name="encryptionCryptoProperties" value="${encryption.properties}"/>
<property name="issuer" value="${issuer}"/>
<property name="encryptionUsername" value="${encryption.username}"/>
<property name="encryptionProperties" ref="encProperties"/>
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
index 9d57e23..09e2580 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
@@ -109,10 +109,10 @@
</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
+ <property name="signatureCryptoProperties" value="stsKeystore.properties"/>
<property name="signatureUsername" value="mystskey"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
+ <property name="encryptionCryptoProperties" value="stsKeystore.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="myservicekey"/>
</bean>
diff --git a/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 125bc24..0468350 100644
--- a/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -40,7 +40,7 @@
</bean>
<bean id="x509STSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureCryptoProperties" value="stsKeystore.properties" />
<property name="signatureUsername" value="mystskey" />
<property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.osgi.CommonCallbackHandler" />
<property name="issuer" value="STSIssuer" />