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:23 UTC
[cxf] 03/04: Removing some more deprecated APIs
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 48706603e30f076362ffd4f87b5d36b6ef83dbf5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Aug 14 13:07:14 2019 +0100
Removing some more deprecated APIs
---
.../httpsignature/provider/PublicKeyProvider.java | 34 ----------
.../jose/common/PrivateKeyPasswordProvider.java | 23 -------
.../cxf/rs/security/oauth2/client/Consumer.java | 19 ------
.../rs/security/oauth2/common/OAuthPermission.java | 7 --
.../cxf/ws/security/kerberos/KerberosClient.java | 23 -------
.../interceptors/STSTokenOutInterceptor.java | 75 ----------------------
.../cxf/ws/security/trust/AbstractSTSClient.java | 5 --
.../cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 11 ----
.../cxf/systest/kerberos/wssec/kerberos/client.xml | 16 +----
.../systest/kerberos/wssec/kerberos/sts-client.xml | 3 +-
.../cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 4 +-
.../systest/kerberos/wssec/sts/stax-cxf-sts.xml | 4 +-
.../security/oauth2/filters/partner-service.xml | 4 +-
.../jaxrs/security/oidc/filters/filters-server.xml | 4 +-
.../systest/wssec/examples/sts/cxf-symmetric.xml | 4 +-
15 files changed, 12 insertions(+), 224 deletions(-)
diff --git a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/provider/PublicKeyProvider.java b/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/provider/PublicKeyProvider.java
deleted file mode 100644
index 9c563fb..0000000
--- a/rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/provider/PublicKeyProvider.java
+++ /dev/null
@@ -1,34 +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.rs.security.httpsignature.provider;
-
-import java.security.PublicKey;
-
-@FunctionalInterface
-@Deprecated
-public interface PublicKeyProvider extends KeyProvider {
- /**
- * @param keyId is used as lookup to find the correct configured public key for this keyId
- * The keyId is sent in the message together with the signature
- * @throws IllegalArgumentException if it can't provide a public key based on keyId
- * @return the public key (which is never {@code null})
- */
- PublicKey getKey(String keyId);
-
-}
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/PrivateKeyPasswordProvider.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/PrivateKeyPasswordProvider.java
deleted file mode 100644
index 0d730e6..0000000
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/PrivateKeyPasswordProvider.java
+++ /dev/null
@@ -1,23 +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.rs.security.jose.common;
-
-@Deprecated
-public interface PrivateKeyPasswordProvider extends org.apache.cxf.rt.security.rs.PrivateKeyPasswordProvider {
-}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/Consumer.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/Consumer.java
index 9f8c7a7..5fd02c8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/Consumer.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/Consumer.java
@@ -36,16 +36,6 @@ public class Consumer {
this.clientSecret = secret;
}
- @Deprecated
- public String getKey() {
- return getClientId();
- }
-
- @Deprecated
- public void setKey(String key) {
- setClientId(key);
- }
-
public String getClientId() {
return clientId;
}
@@ -54,15 +44,6 @@ public class Consumer {
this.clientId = id;
}
- @Deprecated
- public String getSecret() {
- return getClientSecret();
- }
-
- @Deprecated
- public void setSecret(String secret) {
- setClientSecret(secret);
- }
public String getClientSecret() {
return clientSecret;
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index 09646a2..2ebfbf8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -28,7 +28,6 @@ import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OrderColumn;
-import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlRootElement;
@@ -152,12 +151,6 @@ public class OAuthPermission implements Serializable {
return isDefaultPermission;
}
- @Deprecated
- @Transient
- public boolean isDefault() {
- return isDefaultPermission;
- }
-
public boolean isInvisibleToClient() {
return invisibleToClient;
}
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
index 57ea459..c926aa9 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
@@ -25,7 +25,6 @@ import java.util.logging.Logger;
import javax.crypto.SecretKey;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.Configurable;
import org.apache.cxf.helpers.DOMUtils;
@@ -55,10 +54,6 @@ public class KerberosClient implements Configurable {
private boolean isUsernameServiceNameForm;
private boolean useDelegatedCredential;
- @Deprecated
- public KerberosClient(Bus b) {
- }
-
public KerberosClient() {
}
@@ -83,24 +78,6 @@ public class KerberosClient implements Configurable {
}
/**
- * @deprecated
- * Get the JAAS Login module name to use.
- * @return the JAAS Login module name to use
- */
- public String getJaasLoginModuleName() {
- return contextName;
- }
-
- /**
- * @deprecated
- * Set the JAAS Login module name to use.
- * @param jaasLoginModuleName the JAAS Login module name to use
- */
- public void setJaasLoginModuleName(String jaasLoginModuleName) {
- this.contextName = jaasLoginModuleName;
- }
-
- /**
* Get the CallbackHandler to use with the LoginContext
* @return the CallbackHandler to use with the LoginContext
*/
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java
index 3732419..cd27548 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java
@@ -21,8 +21,6 @@ package org.apache.cxf.ws.security.policy.interceptors;
import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-
import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
@@ -41,11 +39,6 @@ import org.apache.cxf.ws.security.trust.STSUtils;
public class STSTokenOutInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(STSTokenOutInterceptor.class);
- private static final String KEY_TYPE_X509 = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey";
- private static final String WS_TRUST_NS = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/";
- private static final QName X509_ENDPOINT = new QName(WS_TRUST_NS, "X509_Port");
- private static final QName TRANSPORT_ENDPOINT = new QName(WS_TRUST_NS, "Transport_Port");
- private static final QName UT_ENDPOINT = new QName(WS_TRUST_NS, "UT_Port");
private STSClient stsClient;
private TokenRequestParams tokenParams;
@@ -104,72 +97,4 @@ public class STSTokenOutInterceptor extends AbstractPhaseInterceptor<Message> {
this.tokenCacher = tokenCacher;
}
- /**
- * A enumeration to specify authentication mode in communication with STS.
- * @deprecated use {@link org.apache.cxf.ws.security.trust.STSAuthParams.AuthMode}
- */
- @Deprecated
- public enum AuthMode {
- X509_ASSYMETRIC(X509_ENDPOINT, KEY_TYPE_X509),
- UT_TRANSPORT(TRANSPORT_ENDPOINT, null),
- UT_SYMMETRIC(UT_ENDPOINT, null);
-
- private final QName endpointName;
- private final String keyType;
-
- AuthMode(QName endpointName, String keyType) {
- this.endpointName = endpointName;
- this.keyType = keyType;
- }
-
- public QName getEndpointName() {
- return endpointName;
- }
-
- public String getKeyType() {
- return keyType;
- }
- }
-
- /**
- * A class to specify authentication parameters for communication with STS.
- * @deprecated use {@link org.apache.cxf.ws.security.trust.STSAuthParams}
- */
- @Deprecated
- public static class AuthParams {
- private final AuthMode authMode;
- private final String userName;
- private final String callbackHandler;
- private final String alias;
- private final String keystoreProperties;
-
- public AuthParams(AuthMode authMode, String userName, String callbackHandler) {
- this(authMode, userName, callbackHandler, null, null);
- }
-
- public AuthParams(AuthMode authMode, String userName, String callbackHandler, String alias,
- String keystoreProperties) {
- this.authMode = authMode;
- this.userName = userName;
- this.callbackHandler = callbackHandler;
- this.alias = alias;
- this.keystoreProperties = keystoreProperties;
- }
-
- public AuthMode getAuthMode() {
- return authMode;
- }
- public String getUserName() {
- return userName;
- }
- public String getCallbackHandler() {
- return callbackHandler;
- }
- public String getAlias() {
- return alias;
- }
- public String getKeystoreProperties() {
- return keystoreProperties;
- }
- }
}
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index eaf44b9..3986576 100755
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -434,11 +434,6 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
this.keyType = keyType;
}
- @Deprecated
- public void setOnBehalfOfElement(Element onBehalfOfElement) {
- this.onBehalfOf = onBehalfOfElement;
- }
-
public void setOnBehalfOf(Object onBehalfOf) {
this.onBehalfOf = onBehalfOf;
}
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index c176df5..ba62aa9 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -68,7 +68,6 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
private WSS4JOutInterceptorInternal ending;
private SAAJOutInterceptor saajOut = new SAAJOutInterceptor();
- private boolean mtomEnabled;
public WSS4JOutInterceptor() {
super();
@@ -83,16 +82,6 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
setProperties(props);
}
- @Deprecated
- public boolean isAllowMTOM() {
- return mtomEnabled;
- }
-
- @Deprecated
- public void setAllowMTOM(boolean allowMTOM) {
- this.mtomEnabled = allowMTOM;
- }
-
@Override
public Object getProperty(Object msgContext, String key) {
// use the superclass first
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
index 385278a..cdffa32 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
@@ -50,7 +50,6 @@
<jaxws:properties>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -85,7 +84,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -99,7 +97,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -113,7 +110,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -130,7 +126,6 @@
<entry key="security.signature.username" value="alice"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -142,7 +137,6 @@
<jaxws:properties>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -162,7 +156,6 @@
<entry key="security.signature.username" value="alice"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -176,7 +169,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -190,7 +182,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -207,7 +198,6 @@
<entry key="security.signature.username" value="alice"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -224,7 +214,6 @@
<entry key="security.signature.username" value="alice"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -238,7 +227,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -252,7 +240,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -266,7 +253,6 @@
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.kerberos.client">
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -287,4 +273,4 @@
</jaxws:outInterceptors>
</jaxws:client>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml
index 60fe827..715b020 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml
@@ -34,7 +34,6 @@
class="org.apache.cxf.systest.kerberos.common.KerberosClientPasswordCallback"/>
<bean class="org.apache.cxf.ws.security.kerberos.KerberosClient" id="kerberosClient">
- <constructor-arg ref="cxf"/>
<property name="contextName" value="alice"/>
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
@@ -74,4 +73,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml
index 0e94b5d..ac35b6c 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml
@@ -66,10 +66,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.kerberos.common.KeystorePasswordCallback"/>
- <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/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml
index 86963cc..8f48610 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml
@@ -66,10 +66,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.kerberos.common.KeystorePasswordCallback"/>
- <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/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml
index 6e2b0fd..9e01c58 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml
@@ -50,8 +50,8 @@ under the License.
</bean>
<bean id="consumer" class="org.apache.cxf.rs.security.oauth2.client.Consumer">
- <property name="key" value="consumer-id"/>
- <property name="secret" value="this-is-a-secret"/>
+ <property name="clientId" value="consumer-id"/>
+ <property name="clientSecret" value="this-is-a-secret"/>
</bean>
<jaxrs-client:client id="atServiceClient" serviceClass="org.apache.cxf.jaxrs.client.WebClient"
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml
index a8116aa..cf23ab6 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml
@@ -78,8 +78,8 @@ under the License.
</bean>
<bean id="consumer" class="org.apache.cxf.rs.security.oauth2.client.Consumer">
- <property name="key" value="consumer-id-oidc"/>
- <property name="secret" value="this-is-a-secret"/>
+ <property name="clientId" value="consumer-id-oidc"/>
+ <property name="clientSecret" value="this-is-a-secret"/>
</bean>
<bean id="idTokenReader" class="org.apache.cxf.rs.security.oidc.rp.IdTokenReader">
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
index d361105..49fd1c4 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
@@ -47,10 +47,10 @@
<value>http://localhost:(\d)*/DoubleItSamlSymmetricIssuedToken</value>
</util:list>
<bean id="symmetricSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="sts.properties"/>
+ <property name="signatureCryptoProperties" value="sts.properties"/>
<property name="signatureUsername" value="sts"/>
<property name="callbackHandlerClass" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
- <property name="encryptionPropertiesFile" value="bob.properties"/>
+ <property name="encryptionCryptoProperties" value="bob.properties"/>
<property name="issuer" value="DoubleItSTSIssuer"/>
<property name="encryptionUsername" value="bob"/>
</bean>