cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [6/6] cxf-fediz git commit: Fixing merge
Date Fri, 03 Jun 2016 13:10:28 GMT
Fixing merge


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

Branch: refs/heads/1.2.x-fixes
Commit: b132fb8463cbef6cfcdee84b4b143abe54699cd0
Parents: ad726f9
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jun 3 14:10:15 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jun 3 14:10:15 2016 +0100

----------------------------------------------------------------------
 .../cxf/fediz/core/federation/AudienceRestrictionTest.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b132fb84/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/AudienceRestrictionTest.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/AudienceRestrictionTest.java
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/AudienceRestrictionTest.java
index bf55170..e69772c 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/AudienceRestrictionTest.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/AudienceRestrictionTest.java
@@ -50,7 +50,7 @@ import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
 import org.apache.wss4j.common.saml.bean.ConditionsBean;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.DOM2Writer;
-import org.apache.wss4j.common.util.XMLUtils;
+import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.easymock.EasyMock;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -400,10 +400,10 @@ public class AudienceRestrictionTest {
         Document doc = STSUtil.toSOAPPart(rstr);
         Element token = assertion.toDOM(doc);
 
-        Element e = XMLUtils.findElement(doc, "RequestedSecurityToken",
+        Element e = WSSecurityUtil.findElement(doc, "RequestedSecurityToken",
                                                         FederationConstants.WS_TRUST_13_NS);
         if (e == null) {
-            e = XMLUtils.findElement(doc, "RequestedSecurityToken",
+            e = WSSecurityUtil.findElement(doc, "RequestedSecurityToken",
                                                     FederationConstants.WS_TRUST_2005_02_NS);
         }
         e.appendChild(token);


Mime
View raw message