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 2015/08/28 14:46:54 UTC
[1/4] cxf git commit: Fixing tests
Repository: cxf
Updated Branches:
refs/heads/master 3c0681f2d -> 7fbbd1d13
Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7fbbd1d1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7fbbd1d1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7fbbd1d1
Branch: refs/heads/master
Commit: 7fbbd1d13bbb7ccbbc1213ed86a456794583fd3e
Parents: ed0f251
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Aug 28 13:46:40 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Aug 28 13:46:47 2015 +0100
----------------------------------------------------------------------
.../cxf/systest/sts/symmetric/SymmetricBindingTest.java | 4 ++--
.../cxf/systest/sts/transport/TransportBindingTest.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7fbbd1d1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index f2e308f..a3fc528 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -274,7 +274,7 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
// Make a successful request
Client client = ((DispatchImpl<DOMSource>) dispatch).getClient();
- client.getRequestContext().put("ws-security.sts.client", stsClient);
+ client.getRequestContext().put(SecurityConstants.STS_CLIENT, stsClient);
if (test.isStreaming()) {
client.getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true");
@@ -315,7 +315,7 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
// Make a successful request
Client client = ((DispatchImpl<DOMSource>) dispatch).getClient();
- client.getRequestContext().put("ws-security.sts.client", stsClient);
+ client.getRequestContext().put(SecurityConstants.STS_CLIENT, stsClient);
//client.getRequestContext().put("find.dispatch.operation", Boolean.TRUE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/7fbbd1d1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 1e6cebd..748d607 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -321,8 +321,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
// Make a successful request
Client client = ((DispatchImpl<DOMSource>) dispatch).getClient();
- client.getRequestContext().put("security.username", "alice");
- client.getRequestContext().put("ws-security.sts.client", stsClient);
+ client.getRequestContext().put(SecurityConstants.USERNAME, "alice");
+ client.getRequestContext().put(SecurityConstants.STS_CLIENT, stsClient);
if (test.isStreaming()) {
client.getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true");
@@ -364,8 +364,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
// Make a successful request
Client client = ((DispatchImpl<DOMSource>) dispatch).getClient();
- client.getRequestContext().put("security.username", "alice");
- client.getRequestContext().put("ws-security.sts.client", stsClient);
+ client.getRequestContext().put(SecurityConstants.USERNAME, "alice");
+ client.getRequestContext().put(SecurityConstants.STS_CLIENT, stsClient);
if (test.isStreaming()) {
client.getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true");
[4/4] cxf git commit: Move STS SecurityConstants to common class
Posted by co...@apache.org.
Move STS SecurityConstants to common class
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91c7b090
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91c7b090
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91c7b090
Branch: refs/heads/master
Commit: 91c7b09005e8d32187283828ac348235b725e3e3
Parents: 3c0681f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Aug 28 12:03:01 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Aug 28 13:46:47 2015 +0100
----------------------------------------------------------------------
.../cxf/rt/security/SecurityConstants.java | 149 ++++++++++++++++-
.../cxf/rt/security/utils/SecurityUtils.java | 17 ++
.../cxf/ws/security/SecurityConstants.java | 159 +------------------
.../ws/security/trust/AbstractSTSClient.java | 30 +++-
.../ws/security/trust/STSTokenRetriever.java | 30 ++--
.../apache/cxf/ws/security/trust/STSUtils.java | 24 +--
.../sts/asymmetric/AsymmetricBindingTest.java | 3 +
.../cxf/systest/sts/common/TokenTestUtils.java | 9 ++
.../IntermediaryCachingPortTypeImpl.java | 3 +
.../IntermediaryPortTypeImpl.java | 3 +
.../UsernameActAsCachingTest.java | 6 +
.../UsernameOnBehalfOfCachingTest.java | 6 +
12 files changed, 249 insertions(+), 190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/rt/security/src/main/java/org/apache/cxf/rt/security/SecurityConstants.java
----------------------------------------------------------------------
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/SecurityConstants.java b/rt/security/src/main/java/org/apache/cxf/rt/security/SecurityConstants.java
index 345c7da..acc671d 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/SecurityConstants.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/SecurityConstants.java
@@ -192,6 +192,148 @@ public class SecurityConstants {
*/
public static final String SUBJECT_CERT_CONSTRAINTS = "security.subject.cert.constraints";
+ //
+ // STS Client Configuration tags
+ //
+
+ /**
+ * A reference to the STSClient class used to communicate with the STS.
+ */
+ public static final String STS_CLIENT = "security.sts.client";
+
+ /**
+ * The "AppliesTo" address to send to the STS. The default is the endpoint address of the
+ * service provider.
+ */
+ public static final String STS_APPLIES_TO = "security.sts.applies-to";
+
+ /**
+ * Whether to write out an X509Certificate structure in UseKey/KeyInfo, or whether to write
+ * out a KeyValue structure. The default value is "false".
+ */
+ public static final String STS_TOKEN_USE_CERT_FOR_KEYINFO = "security.sts.token.usecert";
+
+ /**
+ * Whether to cancel a token when using SecureConversation after successful invocation. The
+ * default is "false".
+ */
+ public static final String STS_TOKEN_DO_CANCEL = "security.sts.token.do.cancel";
+
+ /**
+ * Whether to fall back to calling "issue" after failing to renew an expired token. Some
+ * STSs do not support the renew binding, and so we should just issue a new token after expiry.
+ * The default is true.
+ */
+ public static final String STS_ISSUE_AFTER_FAILED_RENEW = "security.issue.after.failed.renew";
+
+ /**
+ * Set this to "false" to not cache a SecurityToken per proxy object in the
+ * IssuedTokenInterceptorProvider. This should be done if a token is being retrieved
+ * from an STS in an intermediary. The default value is "true".
+ */
+ public static final String CACHE_ISSUED_TOKEN_IN_ENDPOINT =
+ "security.cache.issued.token.in.endpoint";
+
+ /**
+ * Whether to avoid STS client trying send WS-MetadataExchange call using
+ * STS EPR WSA address when the endpoint contract contains no WS-MetadataExchange info.
+ * The default value is "false".
+ */
+ public static final String DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS =
+ "security.sts.disable-wsmex-call-using-epr-address";
+
+ /**
+ * Whether to prefer to use WS-MEX over a STSClient's location/wsdlLocation properties
+ * when making an STS RequestSecurityToken call. This can be set to true for the scenario
+ * of making a WS-MEX call to an initial STS, and using the returned token to make another
+ * call to an STS (which is configured using the STSClient configuration). Default is
+ * "false".
+ */
+ public static final String PREFER_WSMEX_OVER_STS_CLIENT_CONFIG =
+ "security.sts.prefer-wsmex";
+
+ /**
+ * Switch STS client to send Soap 1.2 messages
+ */
+ public static final String STS_CLIENT_SOAP12_BINDING =
+ "security.sts.client-soap12-binding";
+
+ /**
+ *
+ * A Crypto object to be used for the STS. If this is not defined then the
+ * {@link STS_TOKEN_PROPERTIES} is used instead.
+ *
+ * WCF's trust server sometimes will encrypt the token in the response IN ADDITION TO
+ * the full security on the message. These properties control the way the STS client
+ * will decrypt the EncryptedData elements in the response.
+ *
+ * These are also used by the STSClient to send/process any RSA/DSAKeyValue tokens
+ * used if the KeyType is "PublicKey"
+ */
+ public static final String STS_TOKEN_CRYPTO = "security.sts.token.crypto";
+
+ /**
+ * The Crypto property configuration to use for the STS, if {@link STS_TOKEN_CRYPTO} is not
+ * set instead.
+ * The value of this tag must be either:
+ * a) A Java Properties object that contains the Crypto configuration.
+ * b) The path of the Crypto property file that contains the Crypto configuration.
+ * c) A URL that points to the Crypto property file that contains the Crypto configuration.
+ */
+ public static final String STS_TOKEN_PROPERTIES = "security.sts.token.properties";
+
+ /**
+ * The alias name in the keystore to get the user's public key to send to the STS for the
+ * PublicKey KeyType case.
+ */
+ public static final String STS_TOKEN_USERNAME = "security.sts.token.username";
+
+ /**
+ * The token to be sent to the STS in an "ActAs" field. It can be either:
+ * a) A String (which must be an XML statement like "<wst:OnBehalfOf xmlns:wst=...>...</wst:OnBehalfOf>")
+ * b) A DOM Element
+ * c) A CallbackHandler object to use to obtain the token
+ *
+ * In the case of a CallbackHandler, it must be able to handle a
+ * org.apache.cxf.ws.security.trust.delegation.DelegationCallback Object, which contains a
+ * reference to the current Message. The CallbackHandler implementation is required to set
+ * the token Element to be sent in the request on the Callback.
+ *
+ * Some examples that can be reused are:
+ * org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler
+ * org.apache.cxf.ws.security.trust.delegation.WSSUsernameCallbackHandler
+ */
+ public static final String STS_TOKEN_ACT_AS = "security.sts.token.act-as";
+
+ /**
+ * The token to be sent to the STS in an "OnBehalfOf" field. It can be either:
+ * a) A String (which must be an XML statement like "<wst:OnBehalfOf xmlns:wst=...>...</wst:OnBehalfOf>")
+ * b) A DOM Element
+ * c) A CallbackHandler object to use to obtain the token
+ *
+ * In the case of a CallbackHandler, it must be able to handle a
+ * org.apache.cxf.ws.security.trust.delegation.DelegationCallback Object, which contains a
+ * reference to the current Message. The CallbackHandler implementation is required to set
+ * the token Element to be sent in the request on the Callback.
+ *
+ * Some examples that can be reused are:
+ * org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler
+ * org.apache.cxf.ws.security.trust.delegation.WSSUsernameCallbackHandler
+ */
+ public static final String STS_TOKEN_ON_BEHALF_OF = "security.sts.token.on-behalf-of";
+
+ /**
+ * This is the value in seconds within which a token is considered to be expired by the
+ * client. When a cached token (from a STS) is retrieved by the client, it is considered
+ * to be expired if it will expire in a time less than the value specified by this tag.
+ * This prevents token expiry when the message is en route / being processed by the
+ * service. When the token is found to be expired then it will be renewed via the STS.
+ *
+ * The default value is 10 (seconds). Specify 0 to avoid this check.
+ */
+ public static final String STS_TOKEN_IMMINENT_EXPIRY_VALUE =
+ "security.sts.token.imminent-expiry-value";
+
public static final Set<String> COMMON_PROPERTIES;
static {
@@ -201,7 +343,12 @@ public class SecurityConstants {
SIGNATURE_CRYPTO, ENCRYPT_PROPERTIES, ENCRYPT_CRYPTO, ENCRYPT_CERT,
ENABLE_REVOCATION, SUBJECT_CERT_CONSTRAINTS, ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL,
AUDIENCE_RESTRICTION_VALIDATION, SAML_ROLE_ATTRIBUTENAME,
- ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL, SC_FROM_JAAS_SUBJECT
+ ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL, SC_FROM_JAAS_SUBJECT,
+ STS_TOKEN_USE_CERT_FOR_KEYINFO, STS_TOKEN_DO_CANCEL, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
+ DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO,
+ STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS, STS_TOKEN_ON_BEHALF_OF,
+ STS_CLIENT, STS_APPLIES_TO, CACHE_ISSUED_TOKEN_IN_ENDPOINT, PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
+ STS_TOKEN_IMMINENT_EXPIRY_VALUE
}));
COMMON_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java b/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
index a1cefcd..046b7c5 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
@@ -31,6 +31,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.classloader.ClassLoaderUtils.ClassLoaderHolder;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.resource.ResourceManager;
@@ -172,4 +173,20 @@ public final class SecurityUtils {
}
return message.getContextualProperty("ws-" + property);
}
+
+ /**
+ * Get the security property boolean for the given property. It also checks for the older "ws-"* property
+ * values. If none is configured, then the defaultValue parameter is returned.
+ */
+ public static boolean getSecurityPropertyBoolean(String property, Message message, boolean defaultValue) {
+ Object value = message.getContextualProperty(property);
+ if (value == null) {
+ value = message.getContextualProperty("ws-" + property);
+ }
+
+ if (value != null) {
+ return PropertyUtils.isTrue(value);
+ }
+ return defaultValue;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 74eedeb..7d6fcdb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -316,148 +316,6 @@ public final class SecurityConstants extends org.apache.cxf.rt.security.Security
public static final String POLICY_VALIDATOR_MAP = "ws-security.policy.validator.map";
//
- // STS Client Configuration tags
- //
-
- /**
- * A reference to the STSClient class used to communicate with the STS.
- */
- public static final String STS_CLIENT = "ws-security.sts.client";
-
- /**
- * The "AppliesTo" address to send to the STS. The default is the endpoint address of the
- * service provider.
- */
- public static final String STS_APPLIES_TO = "ws-security.sts.applies-to";
-
- /**
- * Whether to write out an X509Certificate structure in UseKey/KeyInfo, or whether to write
- * out a KeyValue structure. The default value is "false".
- */
- public static final String STS_TOKEN_USE_CERT_FOR_KEYINFO = "ws-security.sts.token.usecert";
-
- /**
- * Whether to cancel a token when using SecureConversation after successful invocation. The
- * default is "false".
- */
- public static final String STS_TOKEN_DO_CANCEL = "ws-security.sts.token.do.cancel";
-
- /**
- * Whether to fall back to calling "issue" after failing to renew an expired token. Some
- * STSs do not support the renew binding, and so we should just issue a new token after expiry.
- * The default is true.
- */
- public static final String STS_ISSUE_AFTER_FAILED_RENEW = "ws-security.issue.after.failed.renew";
-
- /**
- * Set this to "false" to not cache a SecurityToken per proxy object in the
- * IssuedTokenInterceptorProvider. This should be done if a token is being retrieved
- * from an STS in an intermediary. The default value is "true".
- */
- public static final String CACHE_ISSUED_TOKEN_IN_ENDPOINT =
- "ws-security.cache.issued.token.in.endpoint";
-
- /**
- * Whether to avoid STS client trying send WS-MetadataExchange call using
- * STS EPR WSA address when the endpoint contract contains no WS-MetadataExchange info.
- * The default value is "false".
- */
- public static final String DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS =
- "ws-security.sts.disable-wsmex-call-using-epr-address";
-
- /**
- * Whether to prefer to use WS-MEX over a STSClient's location/wsdlLocation properties
- * when making an STS RequestSecurityToken call. This can be set to true for the scenario
- * of making a WS-MEX call to an initial STS, and using the returned token to make another
- * call to an STS (which is configured using the STSClient configuration). Default is
- * "false".
- */
- public static final String PREFER_WSMEX_OVER_STS_CLIENT_CONFIG =
- "ws-security.sts.prefer-wsmex";
-
- /**
- * Switch STS client to send Soap 1.2 messages
- */
- public static final String STS_CLIENT_SOAP12_BINDING =
- "ws-security.sts.client-soap12-binding";
-
- /**
- *
- * A Crypto object to be used for the STS. If this is not defined then the
- * {@link STS_TOKEN_PROPERTIES} is used instead.
- *
- * WCF's trust server sometimes will encrypt the token in the response IN ADDITION TO
- * the full security on the message. These properties control the way the STS client
- * will decrypt the EncryptedData elements in the response.
- *
- * These are also used by the STSClient to send/process any RSA/DSAKeyValue tokens
- * used if the KeyType is "PublicKey"
- */
- public static final String STS_TOKEN_CRYPTO = "ws-security.sts.token.crypto";
-
- /**
- * The Crypto property configuration to use for the STS, if {@link STS_TOKEN_CRYPTO} is not
- * set instead.
- * The value of this tag must be either:
- * a) A Java Properties object that contains the Crypto configuration.
- * b) The path of the Crypto property file that contains the Crypto configuration.
- * c) A URL that points to the Crypto property file that contains the Crypto configuration.
- */
- public static final String STS_TOKEN_PROPERTIES = "ws-security.sts.token.properties";
-
- /**
- * The alias name in the keystore to get the user's public key to send to the STS for the
- * PublicKey KeyType case.
- */
- public static final String STS_TOKEN_USERNAME = "ws-security.sts.token.username";
-
- /**
- * The token to be sent to the STS in an "ActAs" field. It can be either:
- * a) A String (which must be an XML statement like "<wst:OnBehalfOf xmlns:wst=...>...</wst:OnBehalfOf>")
- * b) A DOM Element
- * c) A CallbackHandler object to use to obtain the token
- *
- * In the case of a CallbackHandler, it must be able to handle a
- * org.apache.cxf.ws.security.trust.delegation.DelegationCallback Object, which contains a
- * reference to the current Message. The CallbackHandler implementation is required to set
- * the token Element to be sent in the request on the Callback.
- *
- * Some examples that can be reused are:
- * org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler
- * org.apache.cxf.ws.security.trust.delegation.WSSUsernameCallbackHandler
- */
- public static final String STS_TOKEN_ACT_AS = "ws-security.sts.token.act-as";
-
- /**
- * The token to be sent to the STS in an "OnBehalfOf" field. It can be either:
- * a) A String (which must be an XML statement like "<wst:OnBehalfOf xmlns:wst=...>...</wst:OnBehalfOf>")
- * b) A DOM Element
- * c) A CallbackHandler object to use to obtain the token
- *
- * In the case of a CallbackHandler, it must be able to handle a
- * org.apache.cxf.ws.security.trust.delegation.DelegationCallback Object, which contains a
- * reference to the current Message. The CallbackHandler implementation is required to set
- * the token Element to be sent in the request on the Callback.
- *
- * Some examples that can be reused are:
- * org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler
- * org.apache.cxf.ws.security.trust.delegation.WSSUsernameCallbackHandler
- */
- public static final String STS_TOKEN_ON_BEHALF_OF = "ws-security.sts.token.on-behalf-of";
-
- /**
- * This is the value in seconds within which a token is considered to be expired by the
- * client. When a cached token (from a STS) is retrieved by the client, it is considered
- * to be expired if it will expire in a time less than the value specified by this tag.
- * This prevents token expiry when the message is en route / being processed by the
- * service. When the token is found to be expired then it will be renewed via the STS.
- *
- * The default value is 10 (seconds). Specify 0 to avoid this check.
- */
- public static final String STS_TOKEN_IMMINENT_EXPIRY_VALUE =
- "ws-security.sts.token.imminent-expiry-value";
-
- //
// Kerberos Configuration tags
//
@@ -517,18 +375,13 @@ public final class SecurityConstants extends org.apache.cxf.rt.security.Security
NONCE_CACHE_INSTANCE, TIMESTAMP_CACHE_INSTANCE, CACHE_CONFIG_FILE,
TOKEN_STORE_CACHE_INSTANCE, USERNAME_TOKEN_VALIDATOR, SAML1_TOKEN_VALIDATOR,
SAML2_TOKEN_VALIDATOR, TIMESTAMP_TOKEN_VALIDATOR, SIGNATURE_TOKEN_VALIDATOR,
- BST_TOKEN_VALIDATOR, SCT_TOKEN_VALIDATOR, STS_CLIENT, STS_APPLIES_TO,
- STS_TOKEN_USE_CERT_FOR_KEYINFO, STS_TOKEN_DO_CANCEL, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
- DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO,
- STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS, STS_TOKEN_ON_BEHALF_OF,
- TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER, SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
- ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE, ENABLE_SAML_ONE_TIME_USE_CACHE,
+ BST_TOKEN_VALIDATOR, SCT_TOKEN_VALIDATOR, TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
+ SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND, ASYMMETRIC_SIGNATURE_ALGORITHM,
+ PASSWORD_ENCRYPTOR_INSTANCE, ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY, RETURN_SECURITY_ERROR,
- CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT, PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
- DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION,
- KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM, STS_TOKEN_IMMINENT_EXPIRY_VALUE,
- KERBEROS_REQUEST_CREDENTIAL_DELEGATION, POLICY_VALIDATOR_MAP,
- STORE_BYTES_IN_ATTACHMENT, USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM
+ CACHE_IDENTIFIER, DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION,
+ KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM, KERBEROS_REQUEST_CREDENTIAL_DELEGATION,
+ POLICY_VALIDATOR_MAP, STORE_BYTES_IN_ATTACHMENT, USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM
}));
for (String commonProperty : COMMON_PROPERTIES) {
s.add(commonProperty);
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
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 4cc4a13..a5310a0 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
@@ -1554,9 +1554,6 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
protected CallbackHandler createHandler() {
Object o = getProperty(SecurityConstants.CALLBACK_HANDLER);
- if (o == null) {
- o = getProperty("ws-" + SecurityConstants.CALLBACK_HANDLER);
- }
try {
return SecurityUtils.getCallbackHandler(o);
} catch (Exception e) {
@@ -1565,19 +1562,36 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
}
protected Object getProperty(String s) {
- Object o = ctx.get(s);
+ String key = s;
+
+ Object o = ctx.get(key);
+ if (o == null) {
+ o = client.getEndpoint().getEndpointInfo().getProperty(key);
+ }
+ if (o == null) {
+ o = client.getEndpoint().getEndpointInfo().getBinding().getProperty(key);
+ }
if (o == null) {
- o = client.getEndpoint().getEndpointInfo().getProperty(s);
+ o = client.getEndpoint().getService().get(key);
}
+
+ key = "ws-" + s;
if (o == null) {
- o = client.getEndpoint().getEndpointInfo().getBinding().getProperty(s);
+ o = ctx.get(key);
}
if (o == null) {
- o = client.getEndpoint().getService().get(s);
+ o = client.getEndpoint().getEndpointInfo().getProperty(key);
}
+ if (o == null) {
+ o = client.getEndpoint().getEndpointInfo().getBinding().getProperty(key);
+ }
+ if (o == null) {
+ o = client.getEndpoint().getService().get(key);
+ }
+
return o;
}
-
+
protected Crypto createCrypto(boolean decrypt) throws IOException, WSSecurityException {
Crypto crypto = (Crypto)getProperty(SecurityConstants.STS_TOKEN_CRYPTO + (decrypt ? ".decrypt" : ""));
if (crypto != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java
index c9e5dc0..1e60888 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.rt.security.utils.SecurityUtils;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
@@ -61,9 +61,8 @@ public final class STSTokenRetriever {
}
boolean cacheIssuedToken =
- MessageUtils.getContextualBoolean(
+ SecurityUtils.getSecurityPropertyBoolean(SecurityConstants.CACHE_ISSUED_TOKEN_IN_ENDPOINT,
message,
- SecurityConstants.CACHE_ISSUED_TOKEN_IN_ENDPOINT,
true)
&& !isOneTimeUse(tok);
if (cacheIssuedToken) {
@@ -86,9 +85,8 @@ public final class STSTokenRetriever {
private static SecurityToken retrieveCachedToken(Message message) {
boolean cacheIssuedToken =
- MessageUtils.getContextualBoolean(
+ SecurityUtils.getSecurityPropertyBoolean(SecurityConstants.CACHE_ISSUED_TOKEN_IN_ENDPOINT,
message,
- SecurityConstants.CACHE_ISSUED_TOKEN_IN_ENDPOINT,
true);
SecurityToken tok = null;
if (cacheIssuedToken) {
@@ -124,19 +122,19 @@ public final class STSTokenRetriever {
try {
// Transpose ActAs/OnBehalfOf info from original request to the STS client.
Object token =
- message.getContextualProperty(SecurityConstants.STS_TOKEN_ACT_AS);
+ SecurityUtils.getSecurityPropertyValue(SecurityConstants.STS_TOKEN_ACT_AS, message);
if (token != null) {
client.setActAs(token);
}
token =
- message.getContextualProperty(SecurityConstants.STS_TOKEN_ON_BEHALF_OF);
+ SecurityUtils.getSecurityPropertyValue(SecurityConstants.STS_TOKEN_ON_BEHALF_OF, message);
if (token != null) {
client.setOnBehalfOf(token);
}
Map<String, Object> ctx = client.getRequestContext();
mapSecurityProps(message, ctx);
- Object o = message.getContextualProperty(SecurityConstants.STS_APPLIES_TO);
+ Object o = SecurityUtils.getSecurityPropertyValue(SecurityConstants.STS_APPLIES_TO, message);
String appliesTo = o == null ? null : o.toString();
appliesTo = appliesTo == null
? message.getContextualProperty(Message.ENDPOINT_ADDRESS).toString()
@@ -177,8 +175,8 @@ public final class STSTokenRetriever {
SecurityToken tok,
TokenRequestParams params) {
String imminentExpiryValue =
- (String)message
- .getContextualProperty(SecurityConstants.STS_TOKEN_IMMINENT_EXPIRY_VALUE);
+ (String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.STS_TOKEN_IMMINENT_EXPIRY_VALUE,
+ message);
long imminentExpiry = 10L;
if (imminentExpiryValue != null) {
imminentExpiry = Long.parseLong(imminentExpiryValue);
@@ -229,10 +227,8 @@ public final class STSTokenRetriever {
} catch (RuntimeException ex) {
LOG.log(Level.WARNING, "Error renewing a token", ex);
boolean issueAfterFailedRenew =
- MessageUtils
- .getContextualBoolean(
- message,
- SecurityConstants.STS_ISSUE_AFTER_FAILED_RENEW, true);
+ SecurityUtils.getSecurityPropertyBoolean(
+ SecurityConstants.STS_ISSUE_AFTER_FAILED_RENEW, message, true);
if (issueAfterFailedRenew) {
// Perhaps the STS does not support renewing, so try to issue a new token
return issueToken(message, params);
@@ -242,10 +238,8 @@ public final class STSTokenRetriever {
} catch (Exception ex) {
LOG.log(Level.WARNING, "Error renewing a token", ex);
boolean issueAfterFailedRenew =
- MessageUtils
- .getContextualBoolean(
- message,
- SecurityConstants.STS_ISSUE_AFTER_FAILED_RENEW, true);
+ SecurityUtils.getSecurityPropertyBoolean(
+ SecurityConstants.STS_ISSUE_AFTER_FAILED_RENEW, message, true);
if (issueAfterFailedRenew) {
// Perhaps the STS does not support renewing, so try to issue a new token
return issueToken(message, params);
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index 0411140..55d56f4 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -35,7 +35,7 @@ import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.EndpointImpl;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.rt.security.utils.SecurityUtils;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.model.BindingInfo;
@@ -103,8 +103,8 @@ public final class STSUtils {
public static STSClient getClientWithIssuer(Message message, String type, Element issuer) {
// Retrieve or create the STSClient
- STSClient client = (STSClient)message
- .getContextualProperty(SecurityConstants.STS_CLIENT);
+ STSClient client =
+ (STSClient)SecurityUtils.getSecurityPropertyValue(SecurityConstants.STS_CLIENT, message);
if (client == null) {
client = createSTSClient(message, type);
Bus bus = message.getExchange().getBus();
@@ -130,13 +130,15 @@ public final class STSUtils {
String mexLocation = findMEXLocation(epr);
// Configure via WS-MEX
+
if (mexLocation != null
- && MessageUtils.getContextualBoolean(message,
- SecurityConstants.PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
+ && SecurityUtils.getSecurityPropertyBoolean(SecurityConstants.PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
+ message,
false)) {
// WS-MEX call. So now either get the WS-MEX specific STSClient or else create one
- STSClient wsMexClient = (STSClient)message
- .getContextualProperty(SecurityConstants.STS_CLIENT + ".wsmex");
+ STSClient wsMexClient =
+ (STSClient)SecurityUtils.getSecurityPropertyValue(SecurityConstants.STS_CLIENT + ".wsmex",
+ message);
if (wsMexClient == null) {
wsMexClient = createSTSClient(message, type);
}
@@ -145,8 +147,8 @@ public final class STSUtils {
} else if (configureViaEPR(client, epr)) {
// Only use WS-MEX here if the pre-configured STSClient has no location/wsdllocation
boolean useEPRWSAAddrAsMEXLocation =
- !Boolean.valueOf((String)message.getContextualProperty(
- SecurityConstants.DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS));
+ !Boolean.valueOf((String)SecurityUtils.getSecurityPropertyValue(
+ SecurityConstants.DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, message));
client.configureViaEPR(epr, useEPRWSAAddrAsMEXLocation);
return client;
@@ -170,7 +172,9 @@ public final class STSUtils {
Endpoint ep = message.getExchange().getEndpoint();
client.setEndpointName(ep.getEndpointInfo().getName().toString() + type);
client.setBeanName(ep.getEndpointInfo().getName().toString() + type);
- if (MessageUtils.getContextualBoolean(message, SecurityConstants.STS_CLIENT_SOAP12_BINDING, false)) {
+ if (SecurityUtils.getSecurityPropertyBoolean(SecurityConstants.STS_CLIENT_SOAP12_BINDING,
+ message,
+ false)) {
client.setSoap12();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index 9c885b9..540d010 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -205,6 +205,9 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
BindingProvider bindingProvider = (BindingProvider)asymmetricSaml1EncryptedPort;
STSClient stsClient =
(STSClient)bindingProvider.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)bindingProvider.getRequestContext().get("ws-" + SecurityConstants.STS_CLIENT);
+ }
Crypto crypto = CryptoFactory.getInstance("clientKeystore.properties");
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
cryptoType.setAlias("myclientkey");
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
index cffc087..85e59c1 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
@@ -52,6 +52,9 @@ public final class TokenTestUtils {
org.apache.cxf.ws.security.tokenstore.SecurityToken tok = store.getToken(id);
assertNotNull(tok);
STSClient sts = (STSClient)ep.get(SecurityConstants.STS_CLIENT);
+ if (sts == null) {
+ sts = (STSClient)ep.get("ws-" + SecurityConstants.STS_CLIENT);
+ }
List<SecurityToken> validTokens = sts.validateSecurityToken(tok);
assertTrue(validTokens != null && !validTokens.isEmpty());
@@ -75,6 +78,9 @@ public final class TokenTestUtils {
public static void updateSTSPort(BindingProvider p, String port) {
STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)p.getRequestContext().get("ws-" + SecurityConstants.STS_CLIENT);
+ }
if (stsClient != null) {
String location = stsClient.getWsdlLocation();
if (location != null && location.contains("8080")) {
@@ -84,6 +90,9 @@ public final class TokenTestUtils {
}
}
stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT + ".sct");
+ if (stsClient == null) {
+ stsClient = (STSClient)p.getRequestContext().get("ws-" + SecurityConstants.STS_CLIENT + ".sct");
+ }
if (stsClient != null) {
String location = stsClient.getWsdlLocation();
if (location.contains("8080")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
index a0e36ef..add6aeb 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
@@ -69,6 +69,9 @@ public class IntermediaryCachingPortTypeImpl extends AbstractBusClientServerTest
if ("standalone".equals(System.getProperty("sts.deployment"))) {
Map<String, Object> context = ((BindingProvider)transportPort).getRequestContext();
STSClient stsClient = (STSClient)context.get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)context.get("ws-" + SecurityConstants.STS_CLIENT);
+ }
if (stsClient != null) {
String location = stsClient.getWsdlLocation();
if (location.contains("8080")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
index 1c17594..32b4799 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
@@ -68,6 +68,9 @@ public class IntermediaryPortTypeImpl extends AbstractBusClientServerTestBase im
if ("standalone".equals(System.getProperty("sts.deployment"))) {
Map<String, Object> context = ((BindingProvider)transportPort).getRequestContext();
STSClient stsClient = (STSClient)context.get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)context.get("ws-" + SecurityConstants.STS_CLIENT);
+ }
if (stsClient != null) {
String location = stsClient.getWsdlLocation();
if (location.contains("8080")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
index 94260c7..c66eea4 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
@@ -381,6 +381,9 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
// Disable appliesTo
BindingProvider p = (BindingProvider)port;
STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)p.getRequestContext().get("ws-" + SecurityConstants.STS_CLIENT);
+ }
stsClient.setEnableAppliesTo(false);
doubleIt(port, 25);
@@ -407,6 +410,9 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
private void clearSTSClient(BindingProvider p) throws BusException, EndpointException {
STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)p.getRequestContext().get("ws-" + SecurityConstants.STS_CLIENT);
+ }
stsClient.getClient().destroy();
stsClient.setWsdlLocation(null);
stsClient.setLocation(null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c7b090/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
index 644f348..555c5a2 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
@@ -381,6 +381,9 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
// Disable appliesTo
BindingProvider p = (BindingProvider)port;
STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)p.getRequestContext().get("ws-" + SecurityConstants.STS_CLIENT);
+ }
stsClient.setEnableAppliesTo(false);
doubleIt(port, 25);
@@ -407,6 +410,9 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
private void clearSTSClient(BindingProvider p) throws BusException, EndpointException {
STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ if (stsClient == null) {
+ stsClient = (STSClient)p.getRequestContext().get("ws-" + SecurityConstants.STS_CLIENT);
+ }
stsClient.getClient().destroy();
stsClient.setWsdlLocation(null);
stsClient.setLocation(null);
[2/4] cxf git commit: Moving to use new config
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
index 25d649b..9921276 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
@@ -45,7 +45,7 @@
<bean id="defaultTokenStore" class="org.apache.cxf.ws.security.tokenstore.MemoryTokenStore"/>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
@@ -56,9 +56,9 @@
<map>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
index 305e3b8..03c3d6d 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
@@ -44,7 +44,7 @@
<bean id="delegationCallbackHandler" class="org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler"/>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
@@ -55,9 +55,9 @@
<map>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
index f82b4e1..1eeee80 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
@@ -27,16 +27,16 @@
<jaxws:properties>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.disable-wsmex-call-using-epr-address" value="true"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.disable-wsmex-call-using-epr-address" value="true"/>
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="policy" value="classpath:/org/apache/cxf/systest/sts/issuer/sts-transport-policy.xml"/>
<property name="properties">
<map>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -47,19 +47,19 @@
<jaxws:properties>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Soap12Port" createdFromAPI="true">
<jaxws:properties>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
- <entry key="ws-security.sts.client-soap12-binding" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.client-soap12-binding" value="true"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://localhost.*">
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
index d5f60a2..3e9bb09 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
@@ -58,7 +58,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitut" implementor="org.apache.cxf.systest.sts.jaas.DoubleItPortTypeImpl" endpointName="s:DoubleItUTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.jaas.Server}/doubleit/services/doubleitut" wsdlLocation="org/apache/cxf/systest/sts/jaas/DoubleIt.wsdl">
<jaxws:properties>
<entry key="ws-security.validate.token" value="false"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
<jaxws:inInterceptors>
<ref bean="authenticationInterceptor"/>
@@ -97,7 +97,7 @@
<!-- JAX-RS service -->
<jaxrs:server modelRef="classpath:org/apache/cxf/systest/sts/jaas/jaxrs.xml" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.jaas.Server}/doubleit/services/doubleit-rs">
<jaxrs:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxrs:properties>
<jaxrs:inInterceptors>
<ref bean="authenticationInterceptor"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml
index 9be5b69..404f92b 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml
@@ -38,9 +38,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml
index 81f0ab1..435ee5c 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml
@@ -38,9 +38,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
index 7aa315f..9762f13 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
@@ -40,17 +40,17 @@
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1EncryptedPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/UTEncrypted?wsdl"/>
@@ -71,7 +71,7 @@
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2SecureConversationPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client.sct" value-ref="stsClient"/>
+ <entry key="security.sts.client.sct" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml
index 379b905..0869c8d 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml
@@ -25,7 +25,7 @@
</cxf:bus>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
@@ -35,9 +35,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="eve"/>
- <entry key="ws-security.sts.token.properties" value="eveKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="eve"/>
+ <entry key="security.sts.token.properties" value="eveKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -49,7 +49,7 @@
<entry key="security.username" value="myclientkey"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
@@ -60,9 +60,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
index 4479597..2151d9b 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
@@ -32,20 +32,20 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
@@ -55,9 +55,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="false"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="false"/>
</map>
</property>
</bean>
@@ -69,7 +69,7 @@
<entry key="security.username" value="myclientkey"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2X509EndorsingPort" createdFromAPI="true">
@@ -77,7 +77,7 @@
<entry key="security.username" value="myclientkey"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://localhost.*">
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
index 3e456a8..62861c3 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
@@ -31,7 +31,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -45,8 +45,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -60,7 +60,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -74,8 +74,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -89,7 +89,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -103,8 +103,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -118,7 +118,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -132,8 +132,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -147,7 +147,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -161,8 +161,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
index 009c7c1..e2c10fe 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
@@ -31,7 +31,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -45,8 +45,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -60,7 +60,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -74,8 +74,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -89,7 +89,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -103,8 +103,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -118,7 +118,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -132,8 +132,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
@@ -147,7 +147,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
@@ -161,8 +161,8 @@
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
index a2b5740..de025bc 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
@@ -40,19 +40,19 @@
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2EndorsingPort" createdFromAPI="true">
<jaxws:properties>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
index a206f67..048932a 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
@@ -62,7 +62,7 @@
<constructor-arg value="true"/>
</bean>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<ref bean="stsclient"/>
</entry>
</jaxws:properties>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
index 8ac8d42..7a711a3 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
@@ -52,7 +52,7 @@
<constructor-arg value="true"/>
</bean>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<ref bean="stsclient"/>
</entry>
<entry key="ws-security.enable.streaming" value="true"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml
----------------------------------------------------------------------
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 22b7c28..a5af7a7 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
@@ -38,7 +38,7 @@
<entry key="security.username" value="myclientkey"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Kerberos?wsdl"/>
@@ -48,9 +48,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
<entry key="ws-security.kerberos.client" value-ref="kerberosClient"/>
</map>
</property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
index fd1dc44..a0dc1d3 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
@@ -102,7 +102,7 @@
<entry key="security.signature.username" value="alice"/>
<entry key="security.encryption.properties" value="bob.properties"/>
<entry key="security.encryption.username" value="bob"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/Symmetric?wsdl"/>
[3/4] cxf git commit: Moving to use new config
Posted by co...@apache.org.
Moving to use new config
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ed0f2511
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ed0f2511
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ed0f2511
Branch: refs/heads/master
Commit: ed0f25116f8620841ff96dd1b751d97c11eb09c3
Parents: 91c7b09
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Aug 28 12:04:59 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Aug 28 13:46:47 2015 +0100
----------------------------------------------------------------------
.../src/main/resources/wssec-client-stax.xml | 8 ++---
.../sts/src/main/resources/wssec-client.xml | 8 ++---
.../cxf/systest/sts/basic_auth/cxf-service.xml | 4 +--
.../systest/sts/basic_auth/stax-cxf-service.xml | 4 +--
.../sts/binarysecuritytoken/cxf-service.xml | 2 +-
.../binarysecuritytoken/stax-cxf-service.xml | 2 +-
.../systest/sts/caching/cxf-caching-service.xml | 6 ++--
.../cxf/systest/sts/caching/cxf-client.xml | 12 ++++----
.../cxf/systest/sts/claims/cxf-bad-client.xml | 8 ++---
.../systest/sts/claims/cxf-client-cbhandler.xml | 8 ++---
.../cxf/systest/sts/claims/cxf-client.xml | 14 ++++-----
.../cxf/systest/sts/cross_domain/cxf-client.xml | 18 +++++------
.../sts/custom_onbehalfof/cxf-client.xml | 8 ++---
.../sts/custom_onbehalfof/cxf-service.xml | 2 +-
.../sts/distributed_caching/cxf-client.xml | 12 ++++----
.../sts/distributed_caching/cxf-service.xml | 6 ++--
.../systest/sts/kerberos/cxf-intermediary.xml | 8 ++---
.../cxf/systest/sts/realms/cxf-client.xml | 32 ++++++++++----------
.../cxf/systest/sts/realms/cxf-service.xml | 32 ++++++++++----------
.../apache/cxf/systest/sts/renew/cxf-client.xml | 26 ++++++++--------
.../cxf/systest/sts/secure_conv/cxf-client.xml | 10 +++---
.../cxf/systest/sts/secure_conv/cxf-service.xml | 6 ++--
.../cxf/systest/sts/soap12/cxf-client.xml | 8 ++---
.../cxf/systest/sts/soap12/cxf-service.xml | 8 ++---
.../cxf/systest/sts/soap12/stax-cxf-service.xml | 8 ++---
.../sts/sts_sender_vouches/cxf-client.xml | 8 ++---
.../systest/sts/transformation/cxf-service.xml | 4 +--
.../systest/sts/usernametoken/cxf-service.xml | 4 +--
.../sts/usernametoken/stax-cxf-service.xml | 2 +-
.../cxf/systest/sts/asymmetric/cxf-client.xml | 14 ++++-----
.../cxf/systest/sts/bearer/cxf-client.xml | 10 +++---
.../cxf-bad-client.xml | 8 ++---
.../intermediary_transformation/cxf-client.xml | 8 ++---
.../cxf-intermediary-caching.xml | 8 ++---
.../cxf-intermediary.xml | 8 ++---
.../cxf/systest/sts/issuer/cxf-client.xml | 24 +++++++--------
.../apache/cxf/systest/sts/jaas/cxf-service.xml | 4 +--
.../systest/sts/stsclient/cxf-client-name.xml | 6 ++--
.../sts/stsclient/cxf-default-client.xml | 6 ++--
.../cxf/systest/sts/symmetric/cxf-client.xml | 8 ++---
.../systest/sts/transport/cxf-bad-client.xml | 16 +++++-----
.../cxf/systest/sts/transport/cxf-client.xml | 20 ++++++------
.../systest/sts/username_actas/cxf-client.xml | 30 +++++++++---------
.../sts/username_onbehalfof/cxf-client.xml | 30 +++++++++---------
.../systest/sts/x509_symmetric/cxf-client.xml | 6 ++--
.../systest/sts/x509_symmetric/cxf-service.xml | 2 +-
.../sts/x509_symmetric/cxf-stax-service.xml | 2 +-
.../kerberos/wssec/kerberos/sts-client.xml | 8 ++---
.../cxf/systest/wssec/examples/saml/client.xml | 2 +-
49 files changed, 249 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
index 78c28c5..12c9245 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
@@ -31,7 +31,7 @@
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
<entry key="ws-security.enable.streaming" value="true"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
@@ -47,11 +47,11 @@
in the WSP WSDL, the client needs to have the STS add its public
key to the SAML assertion, as configured in the three lines below.
-->
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
<!-- If usecert = true, sends entire certificate in an X509Certificate element, else
sends cert ID in a KeyValue element -->
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
index 35efacd..dba83bf 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
@@ -30,7 +30,7 @@
<entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
@@ -46,11 +46,11 @@
in the WSP WSDL, the client needs to have the STS add its public
key to the SAML assertion, as configured in the three lines below.
-->
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
<!-- If usecert = true, sends entire certificate in an X509Certificate element, else
sends cert ID in a KeyValue element -->
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
index 0929432..1d53759 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
@@ -29,7 +29,7 @@
<ref bean="basicAuthValidator"/>
</jaxws:inInterceptors>
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<ref bean="stsclient"/>
</entry>
</jaxws:properties>
@@ -39,7 +39,7 @@
<ref bean="basicAuthValidator"/>
</jaxrs:inInterceptors>
<jaxrs:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<ref bean="stsclient"/>
</entry>
</jaxrs:properties>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
index 6ec36c2..9cfa22b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
@@ -29,7 +29,7 @@
<ref bean="basicAuthValidator"/>
</jaxws:inInterceptors>
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<ref bean="stsclient"/>
</entry>
<entry key="ws-security.enable.streaming" value="true"/>
@@ -40,7 +40,7 @@
<ref bean="basicAuthValidator"/>
</jaxrs:inInterceptors>
<jaxrs:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<ref bean="stsclient"/>
</entry>
</jaxrs:properties>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
index 9e6373d..05cfa5b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
@@ -34,7 +34,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
<entry key="security.encryption.username" value="useReqSigCert"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
index cf74535..dcfabb4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
@@ -35,7 +35,7 @@
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
<entry key="security.encryption.username" value="useReqSigCert"/>
<entry key="ws-security.enable.streaming" value="true"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
index b4c1d84..86df044 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
@@ -28,7 +28,7 @@
<constructor-arg value="true"/>
</bean>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
@@ -45,7 +45,7 @@
<entry key="ws-security.ut.validator">
<bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
@@ -66,7 +66,7 @@
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
<entry key="security.encryption.properties" value="serviceKeystore.properties"/>
<entry key="security.encryption.username" value="useReqSigCert"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
index 4ff985b..0124abd 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
@@ -33,25 +33,25 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port2" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1AlternativePort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true">
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
index ed8d5fd..3e1a440 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
@@ -26,7 +26,7 @@
</cxf:bus>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1FailingClaimsPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
@@ -36,9 +36,9 @@
<map>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
index bf99950..d8dce9a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
@@ -28,7 +28,7 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ClaimsPort" createdFromAPI="true">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
@@ -39,9 +39,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
index d3b8ea8..678b9ff 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
@@ -33,32 +33,32 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1ClaimsPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1CustomClaimsPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ClaimsPort" createdFromAPI="true">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ChildClaimsPort" createdFromAPI="true">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://localhost:.*">
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
index f38573e..a127bdc 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
@@ -26,7 +26,7 @@
</cxf:bus>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCrossDomainPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.cross_domain.STSServer.2}/SecurityTokenService/a?wsdl"/>
@@ -36,9 +36,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -48,8 +48,8 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCrossDomainMEXPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.prefer-wsmex" value="true"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.prefer-wsmex" value="true"/>
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:30101/SecurityTokenService/a?wsdl"/>
@@ -59,9 +59,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
<property name="enableAppliesTo" value="false"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
index 1702c3a..59b7231 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
@@ -27,7 +27,7 @@
<bean id="delegationCallbackHandler" class="org.apache.cxf.ws.security.trust.delegation.WSSUsernameCallbackHandler"/>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportCustomBSTPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.custom_onbehalfof.STSServer}/SecurityTokenService/Transport?wsdl"/>
@@ -38,9 +38,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
index 8667c34..26f421b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
@@ -26,7 +26,7 @@
<entry key="ws-security.bst.validator">
<bean class="org.apache.cxf.systest.sts.custom_onbehalfof.CustomBSTTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.custom_onbehalfof.STSServer}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
index 7d32949..e613d9c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
@@ -33,25 +33,25 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSCTPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSAMLPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://localhost:.*">
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
index 3db5898..7fb958f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
@@ -26,7 +26,7 @@
<entry key="ws-security.sct.validator">
<bean class="org.apache.cxf.systest.sts.distributed_caching.SCTTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.distributed_caching.STSServer.2}/SecurityTokenService/Transport?wsdl"/>
@@ -45,7 +45,7 @@
<constructor-arg value="true"/>
</bean>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.distributed_caching.STSServer.2}/SecurityTokenService/Transport?wsdl"/>
@@ -64,7 +64,7 @@
<constructor-arg value="true"/>
</bean>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.distributed_caching.STSServer.2}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
index 6f1b650..aa116c2 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
@@ -58,7 +58,7 @@
<entry key="security.username" value="myclientkey"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Kerberos?wsdl"/>
@@ -68,9 +68,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
<entry key="ws-security.kerberos.client" value-ref="kerberosClient"/>
</map>
</property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
index d502fe5..eb4b6ac 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
@@ -26,7 +26,7 @@
</cxf:bus>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRealmAPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmA?wsdl"/>
@@ -36,9 +36,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -47,7 +47,7 @@
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItDefaultRealmPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmdefault?wsdl"/>
@@ -57,9 +57,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -68,7 +68,7 @@
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRealmCPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmC?wsdl"/>
@@ -78,9 +78,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -89,7 +89,7 @@
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRealmTransformPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmA?wsdl"/>
@@ -99,9 +99,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
index fc4ea1a..3ed4ca7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
@@ -24,7 +24,7 @@
<entry key="ws-security.saml2.validator">
<bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/>
@@ -34,9 +34,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -48,7 +48,7 @@
<entry key="ws-security.saml2.validator">
<bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/>
@@ -58,9 +58,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -72,7 +72,7 @@
<entry key="ws-security.saml2.validator">
<bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/>
@@ -82,9 +82,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -96,7 +96,7 @@
<entry key="ws-security.saml2.validator">
<bean class="org.apache.cxf.systest.sts.realms.DifferentRealmValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/>
@@ -106,9 +106,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
<property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
index f50cf30..e6821f0 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
@@ -30,7 +30,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.signature.username" value="myclientkey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.renew.STSServerPOP}/SecurityTokenService/Transport?wsdl"/>
@@ -41,9 +41,9 @@
<property name="allowRenewingAfterExpiry" value="true"/>
<property name="properties">
<map>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -54,7 +54,7 @@
<jaxws:properties>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.renew.STSServerPOP}/SecurityTokenService/Transport?wsdl"/>
@@ -79,9 +79,9 @@
<property name="allowRenewingAfterExpiry" value="true"/>
<property name="properties">
<map>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -92,7 +92,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.signature.username" value="myclientkey"/>
- <entry key="ws-security.sts.client" value-ref="saml2STSClient" />
+ <entry key="security.sts.client" value-ref="saml2STSClient" />
</jaxws:properties>
</jaxws:client>
@@ -106,9 +106,9 @@
<property name="allowRenewingAfterExpiry" value="true"/>
<property name="properties">
<map>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -119,7 +119,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.signature.username" value="myclientkey"/>
- <entry key="ws-security.sts.client" value-ref="saml2STSNoRenewClient" />
+ <entry key="security.sts.client" value-ref="saml2STSNoRenewClient" />
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://localhost:.*">
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
index 515ff21..05f4beb 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
@@ -34,24 +34,24 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
</map>
</property>
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSecureConvPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSecureConvPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
index 4158367..6285fe7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
@@ -26,7 +26,7 @@
<entry key="ws-security.sct.validator">
<bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.secure_conv.STSServer}/SecurityTokenService/TransportSCT?wsdl"/>
@@ -44,7 +44,7 @@
<entry key="ws-security.sct.validator">
<bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.secure_conv.STSServer}/SecurityTokenService/TransportSCT?wsdl"/>
@@ -62,7 +62,7 @@
<entry key="ws-security.sct.validator">
<bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.secure_conv.STSServer}/SecurityTokenService/TransportSCT?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
index 6ea4887..902dbb4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
@@ -26,7 +26,7 @@
</cxf:bus>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.deployment.STSServer}/SecurityTokenService/TransportSoap12?wsdl"/>
@@ -36,9 +36,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
index dfc4d8d..a8dc806 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
@@ -28,7 +28,7 @@
<constructor-arg value="true"/>
</bean>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.deployment.STSServer}/SecurityTokenService/TransportSoap12?wsdl"/>
@@ -38,9 +38,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
index 123d76e..e2149b1 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
@@ -29,7 +29,7 @@
</bean>
</entry>
<entry key="ws-security.enable.streaming" value="true"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.deployment.StaxSTSServer}/SecurityTokenService/TransportSoap12?wsdl"/>
@@ -39,9 +39,9 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
<entry key="ws-security.enable.streaming" value="true"/>
</map>
</property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
index 5de77bc..53c3368 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
@@ -34,9 +34,9 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.username" value="mystskey"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
@@ -47,7 +47,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
index e1c625d..062e3fa 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
@@ -30,7 +30,7 @@
<entry key="ws-security.ut.validator">
<bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
@@ -58,7 +58,7 @@
<entry key="ws-security.ut.validator">
<bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
index 45bd818..14ba9b5 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
@@ -30,7 +30,7 @@
<entry key="ws-security.ut.validator">
<bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
@@ -67,7 +67,7 @@
<property name="useIssueBinding" value="true"/>
</bean>
</entry>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
index e7f0cf8..e594b0d 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
@@ -31,7 +31,7 @@
<bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/>
</entry>
<entry key="ws-security.enable.streaming" value="true"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/Transport?wsdl"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
index bb3f7a6..e98ffba 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
@@ -34,9 +34,9 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.username" value="mystskey"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
</map>
</property>
@@ -48,7 +48,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2Port" createdFromAPI="true">
@@ -58,7 +58,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML1EncryptedPort" createdFromAPI="true">
@@ -68,7 +68,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/UTEncrypted?wsdl"/>
@@ -80,7 +80,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
<entry key="security.encryption.username" value="mystskey"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.usecert" value="true"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
</map>
</property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
index d3db61f..b4281c9 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
@@ -32,20 +32,20 @@
<map>
<entry key="security.username" value="alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2BearerPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2BearerPort2" createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client" value-ref="stsClient"/>
+ <entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://localhost.*">
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
index fc5f296..6370756 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
@@ -28,7 +28,7 @@
<entry key="security.username" value="myclientkey"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
@@ -38,9 +38,9 @@
<map>
<entry key="security.username" value="eve"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
index a0ebbe0..3527b88 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
@@ -28,7 +28,7 @@
<entry key="security.username" value="myclientkey"/>
<entry key="security.signature.properties" value="clientKeystore.properties"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
+ <entry key="security.sts.client">
<bean class="org.apache.cxf.ws.security.trust.STSClient">
<constructor-arg ref="cxf"/>
<property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
@@ -37,9 +37,9 @@
<property name="properties">
<map>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username" value="myclientkey"/>
- <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="security.sts.token.username" value="myclientkey"/>
+ <entry key="security.sts.token.properties" value="clientKeystore.properties"/>
+ <entry key="security.sts.token.usecert" value="true"/>
</map>
</property>
</bean>