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 2016/01/13 13:27:06 UTC
cxf git commit: Some updates following WSS4J changes
Repository: cxf
Updated Branches:
refs/heads/master fa0eea884 -> 8b92fe57d
Some updates following WSS4J changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8b92fe57
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8b92fe57
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8b92fe57
Branch: refs/heads/master
Commit: 8b92fe57dd9a661dab382da7d556b1972f513a93
Parents: fa0eea8
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jan 13 12:26:45 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jan 13 12:26:45 2016 +0000
----------------------------------------------------------------------
.../KerberosTokenInterceptorProvider.java | 2 +-
.../policy/interceptors/NegotiationUtils.java | 2 +-
.../ws/security/wss4j/StaxActionInInterceptor.java | 12 ++++++------
.../ws/security/wss4j/StaxCryptoCoverageChecker.java | 8 ++++----
.../wss4j/StaxSecurityContextInInterceptor.java | 14 +++++++-------
.../cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java | 2 +-
.../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 2 +-
.../policyhandlers/StaxSymmetricBindingHandler.java | 12 ++++++------
.../apache/cxf/sts/operation/TokenIssueOperation.java | 2 +-
.../apache/cxf/sts/token/canceller/SCTCanceller.java | 2 +-
.../cxf/sts/token/provider/TokenProviderUtils.java | 2 +-
11 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
index e64f510..fe5e3af 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
@@ -283,7 +283,7 @@ public class KerberosTokenInterceptorProvider extends AbstractPolicyInterceptorP
(List<SecurityEvent>)message.get(SecurityEvent.class.getName() + ".in");
if (incomingEventList != null) {
for (SecurityEvent incomingEvent : incomingEventList) {
- if (WSSecurityEventConstants.KerberosToken
+ if (WSSecurityEventConstants.KERBEROS_TOKEN
== incomingEvent.getSecurityEventType()) {
return incomingEvent;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
index 884c333..14fe525 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
@@ -211,7 +211,7 @@ final class NegotiationUtils {
(List<SecurityEvent>) message.getExchange().get(SecurityEvent.class.getName() + ".in");
if (incomingEventList != null) {
for (SecurityEvent incomingEvent : incomingEventList) {
- if (WSSecurityEventConstants.SecurityContextToken
+ if (WSSecurityEventConstants.SECURITY_CONTEXT_TOKEN
== incomingEvent.getSecurityEventType()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java
index e64a71c..7559638 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxActionInInterceptor.java
@@ -73,10 +73,10 @@ public class StaxActionInInterceptor extends AbstractPhaseInterceptor<SoapMessag
// First check for a SOAP Fault with no security header if we are the client
if (MessageUtils.isRequestor(soapMessage)
- && isEventInResults(WSSecurityEventConstants.NoSecurity, incomingSecurityEventList)) {
+ && isEventInResults(WSSecurityEventConstants.NO_SECURITY, incomingSecurityEventList)) {
OperationSecurityEvent securityEvent =
(OperationSecurityEvent)findEvent(
- WSSecurityEventConstants.Operation, incomingSecurityEventList
+ WSSecurityEventConstants.OPERATION, incomingSecurityEventList
);
if (securityEvent != null
&& soapMessage.getVersion().getFault().equals(securityEvent.getOperation())) {
@@ -88,14 +88,14 @@ public class StaxActionInInterceptor extends AbstractPhaseInterceptor<SoapMessag
for (XMLSecurityConstants.Action action : inActions) {
Event requiredEvent = null;
if (WSSConstants.TIMESTAMP.equals(action)) {
- requiredEvent = WSSecurityEventConstants.Timestamp;
+ requiredEvent = WSSecurityEventConstants.TIMESTAMP;
} else if (WSSConstants.USERNAMETOKEN.equals(action)) {
- requiredEvent = WSSecurityEventConstants.UsernameToken;
+ requiredEvent = WSSecurityEventConstants.USERNAME_TOKEN;
} else if (WSSConstants.SIGNATURE.equals(action)) {
requiredEvent = WSSecurityEventConstants.SignatureValue;
} else if (WSSConstants.SAML_TOKEN_SIGNED.equals(action)
|| WSSConstants.SAML_TOKEN_UNSIGNED.equals(action)) {
- requiredEvent = WSSecurityEventConstants.SamlToken;
+ requiredEvent = WSSecurityEventConstants.SAML_TOKEN;
}
if (requiredEvent != null
@@ -108,7 +108,7 @@ public class StaxActionInInterceptor extends AbstractPhaseInterceptor<SoapMessag
if (WSSConstants.ENCRYPT.equals(action)) {
boolean foundEncryptionPart =
- isEventInResults(WSSecurityEventConstants.EncryptedPart, incomingSecurityEventList);
+ isEventInResults(WSSecurityEventConstants.ENCRYPTED_PART, incomingSecurityEventList);
if (!foundEncryptionPart) {
foundEncryptionPart =
isEventInResults(WSSecurityEventConstants.EncryptedElement, incomingSecurityEventList);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
index 14c60c5..0450f6d 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
@@ -87,13 +87,13 @@ public class StaxCryptoCoverageChecker extends AbstractPhaseInterceptor<SoapMess
if (incomingSecurityEventList != null) {
// Get all Signed/Encrypted Results
results.addAll(
- getEventFromResults(WSSecurityEventConstants.SignedPart, incomingSecurityEventList));
+ getEventFromResults(WSSecurityEventConstants.SIGNED_PART, incomingSecurityEventList));
results.addAll(
getEventFromResults(WSSecurityEventConstants.SignedElement, incomingSecurityEventList));
if (encryptBody || encryptUsernameToken) {
results.addAll(
- getEventFromResults(WSSecurityEventConstants.EncryptedPart, incomingSecurityEventList));
+ getEventFromResults(WSSecurityEventConstants.ENCRYPTED_PART, incomingSecurityEventList));
results.addAll(
getEventFromResults(WSSecurityEventConstants.EncryptedElement, incomingSecurityEventList));
}
@@ -106,7 +106,7 @@ public class StaxCryptoCoverageChecker extends AbstractPhaseInterceptor<SoapMess
if (signTimestamp) {
// We only insist on the Timestamp being signed if it is actually present in the message
List<SecurityEvent> timestampResults =
- getEventFromResults(WSSecurityEventConstants.Timestamp, incomingSecurityEventList);
+ getEventFromResults(WSSecurityEventConstants.TIMESTAMP, incomingSecurityEventList);
if (!timestampResults.isEmpty()) {
checkSignedTimestamp(results);
}
@@ -122,7 +122,7 @@ public class StaxCryptoCoverageChecker extends AbstractPhaseInterceptor<SoapMess
// We only insist on the UsernameToken being signed/encrypted if it is actually
// present in the message
List<SecurityEvent> usernameTokenResults =
- getEventFromResults(WSSecurityEventConstants.UsernameToken, incomingSecurityEventList);
+ getEventFromResults(WSSecurityEventConstants.USERNAME_TOKEN, incomingSecurityEventList);
if (!usernameTokenResults.isEmpty()) {
if (signUsernameToken) {
checkSignedUsernameToken(results);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
index 9cd3f80..c20105a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
@@ -92,9 +92,9 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor<S
// Now go through the results in a certain order to set up a security context. Highest priority is first.
List<Event> desiredSecurityEvents = new ArrayList<>();
- desiredSecurityEvents.add(WSSecurityEventConstants.SamlToken);
- desiredSecurityEvents.add(WSSecurityEventConstants.UsernameToken);
- desiredSecurityEvents.add(WSSecurityEventConstants.KerberosToken);
+ desiredSecurityEvents.add(WSSecurityEventConstants.SAML_TOKEN);
+ desiredSecurityEvents.add(WSSecurityEventConstants.USERNAME_TOKEN);
+ desiredSecurityEvents.add(WSSecurityEventConstants.KERBEROS_TOKEN);
desiredSecurityEvents.add(WSSecurityEventConstants.X509Token);
desiredSecurityEvents.add(WSSecurityEventConstants.KeyValueToken);
@@ -130,7 +130,7 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor<S
Object receivedAssertion = null;
- if (desiredEvent == WSSecurityEventConstants.SamlToken) {
+ if (desiredEvent == WSSecurityEventConstants.SAML_TOKEN) {
String roleAttributeName = (String)SecurityUtils.getSecurityPropertyValue(
SecurityConstants.SAML_ROLE_ATTRIBUTENAME, msg);
if (roleAttributeName == null || roleAttributeName.length() == 0) {
@@ -162,9 +162,9 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor<S
Event desiredEvent) throws XMLSecurityException {
for (SecurityEvent event : incomingSecurityEventList) {
if (desiredEvent == event.getSecurityEventType()) {
- if (event.getSecurityEventType() == WSSecurityEventConstants.UsernameToken) {
+ if (event.getSecurityEventType() == WSSecurityEventConstants.USERNAME_TOKEN) {
return ((UsernameTokenSecurityEvent)event).getSecurityToken();
- } else if (event.getSecurityEventType() == WSSecurityEventConstants.SamlToken
+ } else if (event.getSecurityEventType() == WSSecurityEventConstants.SAML_TOKEN
&& isSamlEventSigned((SamlTokenSecurityEvent)event)) {
return ((SamlTokenSecurityEvent)event).getSecurityToken();
} else if (event.getSecurityEventType() == WSSecurityEventConstants.X509Token
@@ -173,7 +173,7 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor<S
} else if (event.getSecurityEventType() == WSSecurityEventConstants.KeyValueToken
&& isUsedForPublicKeySignature(((KeyValueTokenSecurityEvent)event).getSecurityToken())) {
return ((KeyValueTokenSecurityEvent)event).getSecurityToken();
- } else if (event.getSecurityEventType() == WSSecurityEventConstants.KerberosToken) {
+ } else if (event.getSecurityEventType() == WSSecurityEventConstants.KERBEROS_TOKEN) {
return ((KerberosTokenSecurityEvent)event).getSecurityToken();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
index 6579401..58a4955 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
@@ -184,7 +184,7 @@ public class WSS4JStaxInInterceptor extends AbstractWSS4JStaxInterceptor {
final SecurityEventListener securityEventListener = new SecurityEventListener() {
@Override
public void registerSecurityEvent(SecurityEvent securityEvent) throws WSSecurityException {
- if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.Timestamp
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.TIMESTAMP
|| securityEvent.getSecurityEventType() == WSSecurityEventConstants.SignatureValue
|| securityEvent instanceof TokenSecurityEvent
|| securityEvent instanceof AbstractSecuredElementSecurityEvent) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
index 1026624..f701d4b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
@@ -194,7 +194,7 @@ public class WSS4JStaxOutInterceptor extends AbstractWSS4JStaxInterceptor {
final SecurityEventListener securityEventListener = new SecurityEventListener() {
@Override
public void registerSecurityEvent(SecurityEvent securityEvent) throws XMLSecurityException {
- if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.SamlToken) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.SAML_TOKEN) {
// Store SAML keys in case we need them on the inbound side
TokenSecurityEvent<?> tokenSecurityEvent = (TokenSecurityEvent<?>)securityEvent;
WSS4JUtils.parseAndStoreStreamingSecurityToken(tokenSecurityEvent.getSecurityToken(), msg);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
index 32a038b..aa4137f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
@@ -173,7 +173,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
if (tok == null && !isRequestor()) {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
- findInboundSecurityToken(WSSecurityEventConstants.SamlToken);
+ findInboundSecurityToken(WSSecurityEventConstants.SAML_TOKEN);
tokenId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message);
}
} else if (encryptionToken instanceof SecureConversationToken
@@ -186,7 +186,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
properties.addAction(actionToPerform);
} else if (tok == null && !isRequestor()) {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
- findInboundSecurityToken(WSSecurityEventConstants.SecurityContextToken);
+ findInboundSecurityToken(WSSecurityEventConstants.SECURITY_CONTEXT_TOKEN);
tokenId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message);
}
} else if (encryptionToken instanceof X509Token) {
@@ -299,7 +299,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
if (sigTok == null && !isRequestor()) {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
- findInboundSecurityToken(WSSecurityEventConstants.SamlToken);
+ findInboundSecurityToken(WSSecurityEventConstants.SAML_TOKEN);
sigTokId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message);
}
} else if (sigToken instanceof SecureConversationToken
@@ -312,7 +312,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
properties.addAction(actionToPerform);
} else if (sigTok == null && !isRequestor()) {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
- findInboundSecurityToken(WSSecurityEventConstants.SecurityContextToken);
+ findInboundSecurityToken(WSSecurityEventConstants.SECURITY_CONTEXT_TOKEN);
sigTokId = WSS4JUtils.parseAndStoreStreamingSecurityToken(securityToken, message);
}
} else if (sigToken instanceof X509Token) {
@@ -620,7 +620,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
(List<SecurityEvent>) message.getExchange().get(SecurityEvent.class.getName() + ".in");
if (incomingEventList != null) {
for (SecurityEvent incomingEvent : incomingEventList) {
- if (WSSecurityEventConstants.EncryptedPart == incomingEvent.getSecurityEventType()
+ if (WSSecurityEventConstants.ENCRYPTED_PART == incomingEvent.getSecurityEventType()
|| WSSecurityEventConstants.EncryptedElement
== incomingEvent.getSecurityEventType()) {
org.apache.xml.security.stax.securityToken.SecurityToken token =
@@ -638,7 +638,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
// Fall back to a Signature in case there was no encrypted Element in the request
for (SecurityEvent incomingEvent : incomingEventList) {
- if (WSSecurityEventConstants.SignedPart == incomingEvent.getSecurityEventType()
+ if (WSSecurityEventConstants.SIGNED_PART == incomingEvent.getSecurityEventType()
|| WSSecurityEventConstants.SignedElement
== incomingEvent.getSecurityEventType()) {
org.apache.xml.security.stax.securityToken.SecurityToken token =
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
index 7a9b57a..a835f2f 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
@@ -421,7 +421,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
// Now try steaming results
try {
org.apache.xml.security.stax.securityToken.SecurityToken securityToken =
- findInboundSecurityToken(WSSecurityEventConstants.SamlToken, messageContext);
+ findInboundSecurityToken(WSSecurityEventConstants.SAML_TOKEN, messageContext);
if (securityToken instanceof SamlSecurityToken
&& ((SamlSecurityToken)securityToken).getSamlAssertionWrapper() != null) {
return ((SamlSecurityToken)securityToken).getSamlAssertionWrapper();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
index 318245c..8bd7bbe 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
@@ -186,7 +186,7 @@ public class SCTCanceller implements TokenCanceller {
(List<SecurityEvent>) messageContext.get(SecurityEvent.class.getName() + ".in");
if (incomingEventList != null) {
for (SecurityEvent incomingEvent : incomingEventList) {
- if (WSSecurityEventConstants.SignedPart == incomingEvent.getSecurityEventType()
+ if (WSSecurityEventConstants.SIGNED_PART == incomingEvent.getSecurityEventType()
|| WSSecurityEventConstants.SignedElement
== incomingEvent.getSecurityEventType()) {
org.apache.xml.security.stax.securityToken.SecurityToken token =
http://git-wip-us.apache.org/repos/asf/cxf/blob/8b92fe57/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
index 53ef14b..b25d7a2 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/TokenProviderUtils.java
@@ -194,7 +194,7 @@ public final class TokenProviderUtils {
(List<SecurityEvent>) context.get(SecurityEvent.class.getName() + ".in");
if (incomingEventList != null) {
for (SecurityEvent incomingEvent : incomingEventList) {
- if (WSSecurityEventConstants.SignedPart == incomingEvent.getSecurityEventType()
+ if (WSSecurityEventConstants.SIGNED_PART == incomingEvent.getSecurityEventType()
|| WSSecurityEventConstants.SignedElement
== incomingEvent.getSecurityEventType()) {
org.apache.xml.security.stax.securityToken.SecurityToken token =