switch to EAAF-Components 1.1.0-SNAPSHOT

7 files changed, 54 insertions, 54 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
index 363eff85..825fe205 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
@@ -64,13 +64,13 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr.SZRClient;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
 import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.exceptions.EAAFParserException;
+import at.gv.egiz.eaaf.core.exceptions.EaafParserException;
 import at.gv.egiz.eaaf.core.impl.data.Trible;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import szrservices.GetIdentityLinkEidasResponse;
 import szrservices.IdentityLinkType;
 import szrservices.PersonInfoType;
@@ -95,7 +95,7 @@ public class SZRClientTest {
 	private static final String PUBKEY_EXPONENT = "AQAB";
 	private static final String PUBKEY_MODULUS = "AJZyj/+sdCMDRq9RkvbFcgSTVn/OfS8EUE81ddwP8MNuJ1kd1SWBUJPaQX2JLJHrL54mkOhrkhH2M/zcuOTu8nW9TOEgXGjrRB/0HpiYKpV+VDJViyyc/GacNLxN4Anw4pima6gHYaJIw9hQkL/nuO2hyh8PGJd7rxeFXJmbLy+X";
 	
-	private static final String DUMMY_TARGET = EAAFConstants.URN_PREFIX_CDID + "ZP";
+	private static final String DUMMY_TARGET = EaafConstants.URN_PREFIX_CDID + "ZP";
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -108,7 +108,7 @@ public class SZRClientTest {
 	public SoapServiceRule soap = SoapServiceRule.newInstance();
 		
 	@Test
-	public void getIdentityLinkRawModeValidResponse() throws SZRException_Exception, EAAFParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException {
+	public void getIdentityLinkRawModeValidResponse() throws SZRException_Exception, EaafParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException {
 		setSZRResponseIdentityLink("/data/szr/szr_resp_valid_1.xml", "http://localhost:1234/demoszr");
 		
 		try {
@@ -140,7 +140,7 @@ public class SZRClientTest {
 	}
 	
 	@Test
-	public void getIdentityLinkRawModeErrorTravelerDocExists() throws SZRException_Exception, EAAFParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException, ParserConfigurationException, SAXException {
+	public void getIdentityLinkRawModeErrorTravelerDocExists() throws SZRException_Exception, EaafParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException, ParserConfigurationException, SAXException {
 		setSZRExceptionIdentityLink("/data/szr/szr_resp_error_travelerdocexists.xml", "http://localhost:1234/demoszr");
 		
 		try {
@@ -199,7 +199,7 @@ public class SZRClientTest {
 	
 	private void setSZRExceptionIdentityLink(String responseXmlPath, String serviceURL) throws JAXBException,ParserConfigurationException, SAXException, IOException, SZRException_Exception {
 		final SZR szrServiceMock = soap.mock(SZR.class, serviceURL);	 
-		final Element detailerror = DOMUtils.parseXmlNonValidating(this.getClass().getResourceAsStream(responseXmlPath));				
+		final Element detailerror = DomUtils.parseXmlNonValidating(this.getClass().getResourceAsStream(responseXmlPath));				
 		final javax.xml.namespace.QName qName = new javax.xml.namespace.QName("urn:SZRServices","F455", "p344");
 		final SoapFault fault = new SoapFault("The travel document you sent to insert a person already exists for another person. Either check the document or have the person altered accordingly", qName);
 		fault.setRole("urn:SZRServices");
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java
index db4f2417..a4aa7ca0 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java
@@ -48,10 +48,10 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr.SZRClient;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
 import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.exceptions.EAAFParserException;
+import at.gv.egiz.eaaf.core.exceptions.EaafParserException;
 import at.gv.egiz.eaaf.core.impl.data.Trible;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
 import szrservices.IdentityLinkType;
@@ -78,7 +78,7 @@ public class SZRClientTestProduction {
 	private static final String PUBKEY_EXPONENT = "AQAB";
 	private static final String PUBKEY_MODULUS = "AJZyj/+sdCMDRq9RkvbFcgSTVn/OfS8EUE81ddwP8MNuJ1kd1SWBUJPaQX2JLJHrL54mkOhrkhH2M/zcuOTu8nW9TOEgXGjrRB/0HpiYKpV+VDJViyyc/GacNLxN4Anw4pima6gHYaJIw9hQkL/nuO2hyh8PGJd7rxeFXJmbLy+X";
 	
-	private static final String DUMMY_TARGET = EAAFConstants.URN_PREFIX_CDID + "ZP";
+	private static final String DUMMY_TARGET = EaafConstants.URN_PREFIX_CDID + "ZP";
 	
 	@Test
 	public void dummyTest() { 
@@ -108,7 +108,7 @@ public class SZRClientTestProduction {
 //	}
 	
 	@Test
-	public void getIdentityLinkRawMode() throws SZRException_Exception, EAAFParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException {
+	public void getIdentityLinkRawMode() throws SZRException_Exception, EaafParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException {
 		log.debug("Starting connecting SZR Gateway");											
 		IdentityLinkType result = szrClient.getIdentityLinkInRawMode(
 									getPersonInfo());
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
index 35d8a760..09af53b7 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
@@ -41,9 +41,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import eu.eidas.auth.commons.light.impl.LightRequest;
 import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
@@ -57,7 +57,7 @@ public class eIDASRequestPreProcessingFirstTest {
 	@Autowired private CCSpecificEIDProcessingService preProcessor; 
 
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	private Builder authnRequestBuilder;
 
 	
@@ -72,14 +72,14 @@ public class eIDASRequestPreProcessingFirstTest {
 	public void setUp() {
 			
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 		authnRequestBuilder = LightRequest.builder();
 		authnRequestBuilder.id(UUID.randomUUID().toString());
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
index ababbd04..c6b1c8d3 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
@@ -40,9 +40,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import eu.eidas.auth.commons.light.impl.LightRequest;
 import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
@@ -56,7 +56,7 @@ public class eIDASRequestPreProcessingSecondTest {
 	@Autowired private CCSpecificEIDProcessingService preProcessor; 
 
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	private Builder authnRequestBuilder;
 
 	
@@ -71,14 +71,14 @@ public class eIDASRequestPreProcessingSecondTest {
 	public void setUp() {
 			
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 		authnRequestBuilder = LightRequest.builder();
 		authnRequestBuilder.id(UUID.randomUUID().toString());
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
index 1f03a079..d89f7751 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
@@ -23,13 +23,13 @@ import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask;
 import at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 import eu.eidas.auth.commons.light.ILightRequest;
@@ -48,7 +48,7 @@ public class GenerateAuthnRequestTaskFirstTest {
 	private MockHttpServletRequest httpReq;
 	private MockHttpServletResponse httpResp;
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -66,14 +66,14 @@ public class GenerateAuthnRequestTaskFirstTest {
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
 	
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 	}
 		
@@ -87,10 +87,10 @@ public class GenerateAuthnRequestTaskFirstTest {
 			
 		} catch (TaskExecutionException e) {
 			//forward URL is not set in example config
-			org.springframework.util.Assert.isInstanceOf(EAAFConfigurationException.class, e.getOriginalException(), "Wrong exception");
-			Assert.assertEquals("wrong errorCode", "config.08", ((EAAFException) e.getOriginalException()).getErrorId());
-			Assert.assertEquals("wrong parameter size", 1, ((EAAFException) e.getOriginalException()).getParams().length);
-			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EAAFException) e.getOriginalException()).getParams()[0]);
+			org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class, e.getOriginalException(), "Wrong exception");
+			Assert.assertEquals("wrong errorCode", "config.08", ((EaafException) e.getOriginalException()).getErrorId());
+			Assert.assertEquals("wrong parameter size", 1, ((EaafException) e.getOriginalException()).getParams().length);
+			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EaafException) e.getOriginalException()).getParams()[0]);
 			
 		}
 		
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java
index cf698f72..8eac7d3f 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java
@@ -24,13 +24,13 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask;
 import at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 import eu.eidas.auth.commons.light.ILightRequest;
@@ -49,7 +49,7 @@ public class GenerateAuthnRequestTaskSecondTest {
 	private MockHttpServletRequest httpReq;
 	private MockHttpServletResponse httpResp;
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -67,14 +67,14 @@ public class GenerateAuthnRequestTaskSecondTest {
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
 	
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 	}
 	
@@ -87,7 +87,7 @@ public class GenerateAuthnRequestTaskSecondTest {
 		} catch (TaskExecutionException e) {			
 			Assert.assertEquals("wrong pendingReqId", pendingReq.getPendingRequestId(), e.getPendingRequestID());
 			org.springframework.util.Assert.isInstanceOf(eIDASAuthenticationException.class, e.getOriginalException(), "Wrong exception");
-			Assert.assertEquals("wrong errorCode", "eidas.03", ((EAAFException) e.getOriginalException()).getErrorId());
+			Assert.assertEquals("wrong errorCode", "eidas.03", ((EaafException) e.getOriginalException()).getErrorId());
 			
 		}
 				
@@ -103,10 +103,10 @@ public class GenerateAuthnRequestTaskSecondTest {
 			
 		} catch (TaskExecutionException e) {
 			//forward URL is not set in example config
-			org.springframework.util.Assert.isInstanceOf(EAAFConfigurationException.class, e.getOriginalException(), "Wrong exception");
-			Assert.assertEquals("wrong errorCode", "config.08", ((EAAFException) e.getOriginalException()).getErrorId());
-			Assert.assertEquals("wrong parameter size", 1, ((EAAFException) e.getOriginalException()).getParams().length);
-			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EAAFException) e.getOriginalException()).getParams()[0]);
+			org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class, e.getOriginalException(), "Wrong exception");
+			Assert.assertEquals("wrong errorCode", "config.08", ((EaafException) e.getOriginalException()).getErrorId());
+			Assert.assertEquals("wrong parameter size", 1, ((EaafException) e.getOriginalException()).getParams().length);
+			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EaafException) e.getOriginalException()).getParams()[0]);
 			
 		}
 		
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
index da4be714..429b2aca 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
@@ -22,11 +22,11 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask;
 import at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 import eu.eidas.auth.commons.light.ILightRequest;
@@ -45,7 +45,7 @@ public class GenerateAuthnRequestTaskThirdTest {
 	private MockHttpServletRequest httpReq;
 	private MockHttpServletResponse httpResp;
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -63,14 +63,14 @@ public class GenerateAuthnRequestTaskThirdTest {
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
 	
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 
 		
 	}