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:20 UTC
[cxf] branch master updated (e6d432b -> 6164a86)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from e6d432b Update master to 3.4.0-SNAPSHOT
new 75e9ae0 CXF-8091 - Update Commons JEXL
new 0deb502 Removing some deprecated STS method calls
new 4870660 Removing some more deprecated APIs
new 6164a86 SLF4J upgrade
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
parent/pom.xml | 6 +-
.../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 --
.../org/apache/cxf/rt/security/claims/Claim.java | 5 ++
.../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 ----
services/sts/sts-core/pom.xml | 2 +-
.../org/apache/cxf/sts/StaticSTSProperties.java | 18 ------
.../cxf/sts/claims/mapper/JexlClaimsMapper.java | 22 +++----
.../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 +-
.../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 +-
48 files changed, 78 insertions(+), 367 deletions(-)
delete mode 100644 rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/provider/PublicKeyProvider.java
delete mode 100644 rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/PrivateKeyPasswordProvider.java
delete mode 100644 services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/STSFailureEvent.java
delete mode 100644 services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/SAMLRealm.java
[cxf] 02/04: Removing some deprecated STS method calls
Posted by co...@apache.org.
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" />
[cxf] 04/04: SLF4J upgrade
Posted by co...@apache.org.
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 6164a86e6884b12091f90429e462ac1ade21cab5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Aug 14 13:07:52 2019 +0100
SLF4J upgrade
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index b8a2e8b..f710fe9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,7 +186,7 @@
<cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
- <cxf.slf4j.version>1.7.26</cxf.slf4j.version>
+ <cxf.slf4j.version>1.7.28</cxf.slf4j.version>
<cxf.snakeyaml.version>1.24</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.boot.version>2.1.7.RELEASE</cxf.spring.boot.version>
[cxf] 03/04: Removing some more deprecated APIs
Posted by co...@apache.org.
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>
[cxf] 01/04: CXF-8091 - Update Commons JEXL
Posted by co...@apache.org.
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 75e9ae0a7d31c14098e821e723cd766aa1e88785
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Aug 14 10:18:24 2019 +0100
CXF-8091 - Update Commons JEXL
---
parent/pom.xml | 4 ++--
.../org/apache/cxf/rt/security/claims/Claim.java | 5 +++++
services/sts/sts-core/pom.xml | 2 +-
.../cxf/sts/claims/mapper/JexlClaimsMapper.java | 22 +++++++++++-----------
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a0e2ee7..b8a2e8b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,7 +147,7 @@
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty9.version>9.4.19.v20190610</cxf.jetty9.version>
- <cxf.jexl.version>2.1.1</cxf.jexl.version>
+ <cxf.jexl.version>3.1</cxf.jexl.version>
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.johnzon.version>1.1.13</cxf.johnzon.version>
<cxf.json.api.version>1.1.4</cxf.json.api.version>
@@ -2427,7 +2427,7 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
+ <artifactId>commons-jexl3</artifactId>
<version>${cxf.jexl.version}</version>
</dependency>
<dependency>
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java b/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java
index 6c6c914..fd596ac 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java
@@ -85,6 +85,11 @@ public class Claim implements Serializable, Cloneable {
this.values.addAll(values);
}
+ @Deprecated
+ public void setValue(Object s) {
+ addValue(s);
+ }
+
public void addValue(Object s) {
this.values.add(s);
}
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index ba250cf..fabeae5 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -130,7 +130,7 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
+ <artifactId>commons-jexl3</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
index fbe3f2e..b01dc98 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapper.java
@@ -27,10 +27,11 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.jexl2.JexlContext;
-import org.apache.commons.jexl2.JexlEngine;
-import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.jexl2.Script;
+import org.apache.commons.jexl3.JexlBuilder;
+import org.apache.commons.jexl3.JexlContext;
+import org.apache.commons.jexl3.JexlEngine;
+import org.apache.commons.jexl3.JexlScript;
+import org.apache.commons.jexl3.MapContext;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.claims.ClaimsMapper;
@@ -41,18 +42,17 @@ public class JexlClaimsMapper implements ClaimsMapper {
private static final Logger LOG = LogUtils.getL7dLogger(JexlClaimsMapper.class);
- private JexlEngine jexlEngine = new JexlEngine();
- private Script script;
+ private JexlEngine jexlEngine;
+ private JexlScript script;
public JexlClaimsMapper() {
// jexl.setCache(512);
// jexl.setLenient(false);
- jexlEngine.setSilent(false);
Map<String, Object> functions = new HashMap<>();
functions.put("claims", new ClaimUtils());
functions.put("LOG", LOG);
- jexlEngine.setFunctions(functions);
+ jexlEngine = new JexlBuilder().silent(false).namespaces(functions).create();
}
public JexlClaimsMapper(String script) throws IOException {
@@ -72,7 +72,7 @@ public class JexlClaimsMapper implements ClaimsMapper {
context.set("targetRealm", targetRealm);
context.set("claimsParameters", parameters);
- Script s = getScript();
+ JexlScript s = getScript();
if (s == null) {
LOG.warning("No claim mapping script defined");
return new ProcessedClaimCollection(); // TODO Check if null or an exception would be more
@@ -81,11 +81,11 @@ public class JexlClaimsMapper implements ClaimsMapper {
return (ProcessedClaimCollection)s.execute(context);
}
- public Script getScript() {
+ public JexlScript getScript() {
return script;
}
- public final void setScript(Script script) {
+ public final void setScript(JexlScript script) {
this.script = script;
}