refactor(eidas): split 'authmodule-eIDAS-v2' into 'common-eidas'

 code and connector-specific elements

3 files changed, 53 insertions, 58 deletions

diff --git a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
index 55958d9e..2b652f79 100644
--- a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
+++ b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opensaml.saml.saml2.core.NameIDType;
 import org.opensaml.saml.saml2.core.StatusCode;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -37,10 +36,9 @@ import com.google.common.collect.ImmutableSortedSet;
 
 import at.asitplus.eidas.specific.core.config.ServiceProviderConfiguration;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
+import at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService;
 import at.asitplus.eidas.specific.modules.msproxyservice.MsProxyServiceConstants;
 import at.asitplus.eidas.specific.modules.msproxyservice.exception.EidasProxyServiceException;
 import at.asitplus.eidas.specific.modules.msproxyservice.protocol.EidasProxyServiceController;
@@ -59,7 +57,6 @@ import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
 import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@PrepareForTest(CreateIdentityLinkTask.class)
 @ContextConfiguration(locations = {
     "/spring/SpringTest-context_basic_test.xml",
     "/spring/SpringTest-context_basic_mapConfig.xml",
@@ -222,9 +219,9 @@ public class EidasProxyServiceControllerTest {
         .levelOfAssurance(EaafConstants.EIDAS_LOA_HIGH)
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
             .build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -250,7 +247,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -280,7 +277,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -345,7 +342,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -389,7 +386,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -433,7 +430,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -466,7 +463,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     
     proxyService.setiLightRequest(authnReqBuilder.build());
@@ -502,7 +499,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -556,7 +553,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
@@ -613,7 +610,7 @@ public class EidasProxyServiceControllerTest {
         .spType("public")
         .requestedAttributes(ImmutableAttributeMap.builder()
             .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-                Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
+                EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first()).build());
     
     proxyService.setiLightRequest(authnReqBuilder.build());
     
diff --git a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
index 21d2f3b7..97b5bc03 100644
--- a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
+++ b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
@@ -24,7 +24,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opensaml.saml.saml2.core.NameIDType;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -39,9 +38,8 @@ import com.google.common.collect.ImmutableSortedSet;
 import at.asitplus.eidas.specific.core.MsEidasNodeConstants;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummySpConfiguration;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.msproxyservice.protocol.ProxyServiceAuthenticationAction;
 import at.asitplus.eidas.specific.modules.msproxyservice.protocol.ProxyServicePendingRequest;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
@@ -64,7 +62,6 @@ import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
 import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@PrepareForTest(CreateIdentityLinkTask.class)
 @ContextConfiguration(locations = {
     "/spring/SpringTest-context_basic_test.xml",
     "/spring/SpringTest-context_basic_mapConfig.xml",
@@ -163,11 +160,11 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 4, respAttr.size());    
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH, 
         authData.getDateOfBirth());
         
   }
@@ -199,19 +196,19 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 8, respAttr.size());    
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
 
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_NAT_MANDATOR_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_NAT_PER_FAMILY_NAME_NAME));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_NAT_PER_GIVEN_NAME_NAME));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_NAT_PER_BIRTHDATE_NAME));
            
   }
@@ -237,25 +234,25 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 6, respAttr.size());  
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
    
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_JUR_MANDATOR_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_LEGALNAME, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_LEGALNAME, 
         (String) attr.get(PvpAttributeDefinitions.MANDATE_LEG_PER_FULL_NAME_NAME));
     
     assertNull("find nat. person subject: personalId", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER));
     assertNull("find nat. person subject: familyName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME));
     assertNull("find nat. person subject: givenName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME));
     assertNull("find nat. person subject: dateOfBirth", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH));
     
   }
   
@@ -267,7 +264,7 @@ public class ProxyServiceAuthenticationActionTest {
     //request natural person subject only
     LightRequest.Builder eidasRequestBuilder = generateBasicLightRequest();
     eidasRequestBuilder.requestedAttributes(ImmutableAttributeMap.builder().put(
-        attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
+        attrRegistry.getCoreAttributeRegistry().getByFriendlyName(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first()).build());
     pendingReq.setEidasRequest(eidasRequestBuilder.build());
     
     
@@ -307,8 +304,8 @@ public class ProxyServiceAuthenticationActionTest {
     //request natural person subject only
     LightRequest.Builder eidasRequestBuilder = generateBasicLightRequest();
     eidasRequestBuilder.requestedAttributes(ImmutableAttributeMap.builder()
-        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
-        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
+        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first())
+        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
         .build());
     pendingReq.setEidasRequest(eidasRequestBuilder.build());
         
@@ -331,11 +328,11 @@ public class ProxyServiceAuthenticationActionTest {
     
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 10, respAttr.size());  
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER, 
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, 
         (String) attr.get(MsEidasNodeConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
-    checkAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH, authData.getDateOfBirth());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
+    checkAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH, authData.getDateOfBirth());
    
   }
   
@@ -347,7 +344,8 @@ public class ProxyServiceAuthenticationActionTest {
     //request natural person subject only
     LightRequest.Builder eidasRequestBuilder = generateBasicLightRequest();
     eidasRequestBuilder.requestedAttributes(ImmutableAttributeMap.builder()
-        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
+        .put(attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
+            EidasConstants.eIDAS_ATTR_LEGALPERSONIDENTIFIER).first())
         .build());
     pendingReq.setEidasRequest(eidasRequestBuilder.build());
         
@@ -371,13 +369,13 @@ public class ProxyServiceAuthenticationActionTest {
     ImmutableAttributeMap respAttr = validateBasicEidasResponse(authData);
     assertEquals("wrong attr. size", 6, respAttr.size());     
     assertNull("find nat. person subject: personalId", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER));
     assertNull("find nat. person subject: familyName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME));
     assertNull("find nat. person subject: givenName", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME));
     assertNull("find nat. person subject: dateOfBirth", 
-        getAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH));
+        getAttrValue(respAttr, EidasConstants.eIDAS_ATTR_DATEOFBIRTH));
     
   }
   
diff --git a/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml b/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml
index 9870d22a..08b25f0f 100644
--- a/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml
+++ b/modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_test.xml
@@ -14,7 +14,7 @@
   <import resource="classpath:/spring/eidas_proxy-service.beans.xml"/>
 
   <bean id="springManagedSpecificProxyserviceCommunicationService"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService" />
+        class="at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService" />
 
  <bean id="mvcGUIBuilderImpl"
     class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
@@ -32,7 +32,7 @@
   </bean>
 
   <bean id="attributeRegistry"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry">
+    class="at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry">
     <property name="eidasAttributesFile"
       ref="specificConnectorAttributesFileWithPath" />
     <property name="additionalAttributesFile"