Repository: cxf-fediz Updated Branches: refs/heads/master f65c961ea -> 6310703bb
Use Fediz DOMUtils instead in the IdP Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6310703b Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6310703b Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6310703b Branch: refs/heads/master Commit: 6310703bb32cbfe7d25cc7dfb437f83fc6fe04f8 Parents: f65c961 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Jul 2 17:32:46 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Jul 2 17:32:46 2015 +0100 ---------------------------------------------------------------------- .../cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java | 5 ++--- .../fediz/service/idp/kerberos/PassThroughKerberosClient.java | 2 +- .../service/idp/protocols/TrustedIdpSAMLProtocolHandler.java | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6310703b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java index 13c277b..45ec0a3 100644 --- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java +++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java @@ -24,9 +24,8 @@ import java.util.List; import javax.xml.namespace.QName; import org.w3c.dom.Document; - import org.apache.cxf.Bus; -import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.fediz.core.util.DOMUtils; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.wss4j.dom.WSConstants; import org.apache.xml.security.exceptions.XMLSecurityException; @@ -89,7 +88,7 @@ public class STSPreAuthAuthenticationProvider extends STSAuthenticationProvider } // Convert the received certificate to a DOM Element to write it out "OnBehalfOf" - Document doc = DOMUtils.newDocument(); + Document doc = DOMUtils.createDocument(); X509Data certElem = new X509Data(doc); try { certElem.addCertificate(cert); http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6310703b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java ---------------------------------------------------------------------- diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java index 6088bed..f97ae50 100644 --- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java +++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java @@ -19,7 +19,7 @@ package org.apache.cxf.fediz.service.idp.kerberos; -import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.fediz.core.util.DOMUtils; import org.apache.cxf.ws.security.kerberos.KerberosClient; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.wss4j.common.util.KeyUtils; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6310703b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java ---------------------------------------------------------------------- diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java index b2cfdea..eef725f 100644 --- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java +++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java @@ -42,18 +42,17 @@ import javax.ws.rs.core.UriBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; - import org.apache.cxf.common.util.Base64Exception; import org.apache.cxf.common.util.Base64Utility; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.fediz.core.FederationConstants; import org.apache.cxf.fediz.core.exception.ProcessingException; import org.apache.cxf.fediz.core.util.CertsUtils; +import org.apache.cxf.fediz.core.util.DOMUtils; import org.apache.cxf.fediz.service.idp.domain.Idp; import org.apache.cxf.fediz.service.idp.domain.TrustedIdp; import org.apache.cxf.fediz.service.idp.spi.TrustedIdpProtocolHandler; import org.apache.cxf.fediz.service.idp.util.WebUtils; -import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.jaxrs.utils.ExceptionUtils; import org.apache.cxf.rs.security.saml.DeflateEncoderDecoder; import org.apache.cxf.rs.security.saml.sso.AuthnRequestBuilder;
