Repository: cxf-fediz
Updated Branches:
refs/heads/1.1.x-fixes cb7e832c4 -> e1750927c
Use Fediz DOMUtils instead in the IdP
Conflicts:
services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java
services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e1750927
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e1750927
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e1750927
Branch: refs/heads/1.1.x-fixes
Commit: e1750927c1591e01037f673bce828426d1949edf
Parents: cb7e832
Author: Colm O hEigeartaigh <[email protected]>
Authored: Thu Jul 2 17:32:46 2015 +0100
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Fri Jul 3 16:08:33 2015 +0100
----------------------------------------------------------------------
.../cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e1750927/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 687d35f..58b4fbb 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.ws.security.WSConstants;
