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/11/09 13:21:25 UTC
cxf git commit: Fixing merge
Repository: cxf
Updated Branches:
refs/heads/master 9f5675074 -> 8a5fae177
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8a5fae17
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8a5fae17
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8a5fae17
Branch: refs/heads/master
Commit: 8a5fae177a294e178b12bb7d0243299edfb89432
Parents: 9f56750
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 9 12:19:08 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 9 12:19:08 2015 +0000
----------------------------------------------------------------------
.../org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a5fae17/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
index 9e2f8a7..3a8b496 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
@@ -29,6 +29,9 @@ import java.util.Properties;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
@@ -56,8 +59,6 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
import org.junit.Assert;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
/**
* Some unit tests for the issue operation to issue JWT tokens in a specific realm.