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/05/22 16:52:54 UTC

cxf git commit: Picking up latest WSS4J changes

Repository: cxf
Updated Branches:
  refs/heads/master f7c91cac6 -> 962f81674


Picking up latest WSS4J changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/962f8167
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/962f8167
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/962f8167

Branch: refs/heads/master
Commit: 962f8167450b19b7819355141bfa9617fcb2e2c5
Parents: f7c91ca
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri May 22 15:52:19 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri May 22 15:52:40 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/962f8167/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 8cec92e..4cc4a13 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
@@ -123,8 +123,8 @@ import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.processor.EncryptedKeyProcessor;
-import org.apache.wss4j.dom.processor.X509Util;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.apache.wss4j.dom.util.X509Util;
 import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
 import org.apache.wss4j.policy.SPConstants;
 import org.apache.wss4j.policy.SPConstants.SPVersion;