switch to EAAF-Components 1.1.0-SNAPSHOT

1 files changed, 7 insertions, 7 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
index 6d7b7fd8..6bffef3b 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
@@ -75,9 +75,9 @@ import org.w3c.dom.Element;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.SZRCommunicationException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.LoggingHandler;
-import at.gv.egiz.eaaf.core.api.data.XMLNamespaceConstants;
+import at.gv.egiz.eaaf.core.api.data.XmlNamespaceConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
 import at.gv.egiz.eaaf.core.impl.utils.KeyStoreUtils;
 import szrservices.GetBPK;
@@ -141,10 +141,10 @@ public class SZRClient {
 				log.trace(new String(szrResponse));
 				
 				// ok, we have success
-				Document doc = DOMUtils.parseDocument(
+				Document doc = DomUtils.parseDocument(
 							new ByteArrayInputStream(szrResponse),
 							true, 
-							XMLNamespaceConstants.ALL_SCHEMA_LOCATIONS + " " + Constants.SZR_SCHEMA_LOCATIONS, 
+							XmlNamespaceConstants.ALL_SCHEMA_LOCATIONS + " " + Constants.SZR_SCHEMA_LOCATIONS, 
 							null, null
 						);				
 				String xpathExpression = "//saml:Assertion";				
@@ -153,7 +153,7 @@ public class SZRClient {
 				log.trace("Selecting signed doc " + xpathExpression);
 				Element documentNode = (Element) XPathAPI.selectSingleNode(doc,
 				    xpathExpression, nsNode);
-				log.trace("Signed document: " + DOMUtils.serializeNode(documentNode));
+				log.trace("Signed document: " + DomUtils.serializeNode(documentNode));
 
 				
 				IdentityLinkType idl = new IdentityLinkType();
@@ -323,7 +323,7 @@ public class SZRClient {
 				log.trace("Find keyStore path: " + keyStorePath + " Injecting SSL client certificate ... ");
 				try {
 					KeyStore keyStore = KeyStoreUtils.loadKeyStore(
-							FileUtils.makeAbsoluteURL(keyStorePath, basicConfig.getConfigurationRootDirectory()), 
+							FileUtils.makeAbsoluteUrl(keyStorePath, basicConfig.getConfigurationRootDirectory()), 
 							keyStorePassword);
 				
 					KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
@@ -350,7 +350,7 @@ public class SZRClient {
 				log.trace("Find trustStore path: " + trustStorePath + " Injecting SSL TrustStore ... ");
 				try {
 					KeyStore trustStore = KeyStoreUtils.loadKeyStore(
-							FileUtils.makeAbsoluteURL(trustStorePath, basicConfig.getConfigurationRootDirectory()), 
+							FileUtils.makeAbsoluteUrl(trustStorePath, basicConfig.getConfigurationRootDirectory()), 
 							trustStorePassword);
 				
 					TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");