refactor(core): move 'connector_lib' to 'core_common_lib'

7 files changed, 0 insertions, 647 deletions

diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/BasicConfigProviderTest.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/BasicConfigProviderTest.java
deleted file mode 100644
index d1623b00..00000000
--- a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/BasicConfigProviderTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package at.asitplus.eidas.specific.connector.test.config;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
-import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {
-    "/SpringTest-context_basic_realConfig.xml"})
-@DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
-public class BasicConfigProviderTest {
-
-  @Autowired private IConfigurationWithSP basicConfig;
-  
-  /**
-   * jUnit class initializer.
-   * 
-   */
-  @BeforeClass
-  public static void classInitializer() {
-    final String current = new java.io.File(".").toURI().toString();
-    System.setProperty("eidas.ms.configuration", current + "src/test/resources/config/junit_config_1.properties");
-    
-  }
-  
-  @Test
-  public void configPropInfos() {
-    Assert.assertEquals("size", 2, MsEidasNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST.size());
-    
-  }
-  
-  @Test
-  public void loadSpNoExist() throws EaafConfigurationException {
-    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
-        RandomStringUtils.randomAlphabetic(5));
-    Assert.assertNull("spConfig", spConfig);
-    
-  }
-  
-  @Test
-  public void loadSpConfigBasicMode() throws EaafConfigurationException {
-    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration("jUnitTest1");
-    
-    Assert.assertNotNull("spConfig", spConfig);
-    Assert.assertEquals("uniqueId", "jUnitTest1", spConfig.getUniqueIdentifier());
-    Assert.assertEquals("friendlyName", "NO FRIENDLYNAME SET", spConfig.getFriendlyName());
-    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
-    String test = RandomStringUtils.randomAlphabetic(5);
-    Assert.assertEquals("pvp2.password", "1234pass", 
-        spConfig.getConfigurationValue("pvp2.metadata.truststore.password", test));
-    Assert.assertEquals("eidMode", true, spConfig.isConfigurationValue("newEidMode"));
-    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
-    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
-    Assert.assertEquals("fullConfig", 4, spConfig.getFullConfiguration().size());
-    
-  }
-  
-  @Test
-  public void loadSpConfigAdvancedMode() throws EaafConfigurationException {
-    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
-        "jUnitTest2", ServiceProviderConfiguration.class);
-    
-    Assert.assertNotNull("spConfig", spConfig);
-    Assert.assertEquals("uniqueId", "jUnitTest2", spConfig.getUniqueIdentifier());
-    Assert.assertEquals("friendlyName", "jUnit tester 2", spConfig.getFriendlyName());
-    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
-    String test = RandomStringUtils.randomAlphabetic(5);
-    Assert.assertEquals("pvp2.password", test, 
-        spConfig.getConfigurationValue("pvp2.metadata.truststore.notexist", test));
-    Assert.assertEquals("eidMode", false, spConfig.isConfigurationValue("newEidMode"));
-    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
-    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
-    Assert.assertEquals("fullConfig", 5, spConfig.getFullConfiguration().size());
-    Assert.assertFalse("baseIdInternal", spConfig.hasBaseIdInternalProcessingRestriction());
-    Assert.assertTrue("baseIdTransfer", spConfig.hasBaseIdTransferRestriction());
-    
-  }
-  
-  @Test
-  public void loadSpConfigAdvancedModeWrongDecorator() throws EaafConfigurationException {
-    ISpConfiguration spConfig1 = basicConfig.getServiceProviderConfiguration(
-        "jUnitTest2", null);    
-    Assert.assertNull("spConfig", spConfig1);
-
-    String spConfig2 = basicConfig.getServiceProviderConfiguration(
-        "jUnitTest2", String.class);    
-    Assert.assertNull("spConfig", spConfig2);
-    
-  }
-  
-  @Test
-  public void loadConfigValuesString() {
-    Assert.assertEquals("without default", "ownSpecificConnector", 
-        basicConfig.getBasicConfiguration("auth.eIDAS.node_v2.entityId"));
-    
-    Assert.assertEquals("with default", "", 
-        basicConfig.getBasicConfiguration("auth.eIDAS.szrclient.endpoint.prod", 
-            RandomStringUtils.randomAlphabetic(5)));
-    
-    String rand1 = RandomStringUtils.randomAlphanumeric(5);
-    Assert.assertEquals("unknown with default", rand1, 
-        basicConfig.getBasicConfiguration("notexist", rand1));
-    
-  }
-  
-  @Test
-  public void loadConfigValuesBoolean() {
-    Assert.assertEquals("without default", true, 
-        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.useTestService"));
-    
-    Assert.assertEquals("with default", false, 
-        basicConfig.getBasicConfigurationBoolean("auth.notexist", 
-            false));
-    
-    Assert.assertEquals("unknown with default", false, 
-        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.params.vkz", true));
-    
-  }
-  
-  @Test
-  public void loadConfigMap() {
-    Map<String, String> entries = basicConfig.getBasicConfigurationWithPrefix("auth.eIDAS.szrclient");
-    Assert.assertEquals("wrong size", 16, entries.size());
-    Assert.assertTrue("missing element", entries.containsKey("endpoint.test"));
-    Assert.assertEquals("wrong entry", "http://localhost:1234/demoszr", entries.get("endpoint.test"));
-    
-  }
-  
-  @Test
-  public void validateUrl() throws MalformedURLException, EaafException {
-    Assert.assertEquals("wrong URL", "http://localhost/test", 
-        basicConfig.validateIdpUrl(new URL("http://localhost/test/" + RandomStringUtils.randomAlphabetic(5))));
-   
-    Assert.assertNull("wrong URL",
-        basicConfig.validateIdpUrl(new URL("http://localhost/wrong/" + RandomStringUtils.randomAlphabetic(5))));
-    
-  }
-}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/ServiceProviderConfigurationTest.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/ServiceProviderConfigurationTest.java
deleted file mode 100644
index d95e2882..00000000
--- a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/ServiceProviderConfigurationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package at.asitplus.eidas.specific.connector.test.config;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
-
-import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
-import at.asitplus.eidas.specific.connector.test.config.dummy.MsConnectorDummyConfigMap;
-import at.gv.egiz.eaaf.core.api.data.EaafConstants;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-
-@RunWith(BlockJUnit4ClassRunner.class)
-public class ServiceProviderConfigurationTest {
-
-  
-  
-  @Test
-  public void spConfigLoad() throws EaafException {
-    IConfiguration authConfig = new MsConnectorDummyConfigMap();
-    
-    Map<String, String> map = new HashMap<>();
-    map.put("uniqueID", RandomStringUtils.randomAlphabetic(10));
-    map.put("policy.allowed.requested.targets", "urn:publicid:gv.at:cdid\\+.*");
-
-    ServiceProviderConfiguration spConfig = new ServiceProviderConfiguration(map, authConfig);
-    
-    spConfig.setRequiredLoA(Arrays.asList(EaafConstants.EIDAS_LOA_LOW));
-    Assert.assertEquals("LoA", 1, spConfig.getRequiredLoA().size());
-    Assert.assertEquals("LoA", "http://eidas.europa.eu/LoA/low", spConfig.getRequiredLoA().get(0));
-    
-    spConfig.setLoAMachtingMode("exact");
-    Assert.assertEquals("wrong machtingMode", "exact", spConfig.getLoAMatchingMode());
-    
-    String bpkTarget = EaafConstants.URN_PREFIX_CDID + RandomStringUtils.randomAlphabetic(2);
-    spConfig.setBpkTargetIdentifier(bpkTarget);
-    Assert.assertEquals("wrong bPK", bpkTarget, spConfig.getAreaSpecificTargetIdentifier());
-    
-    
-    try {
-      spConfig.setBpkTargetIdentifier(EaafConstants.URN_PREFIX_WBPK + RandomStringUtils.randomAlphabetic(2));
-      
-    } catch (EaafException e) {
-      Assert.assertEquals("ErrorId", "auth.37", e.getErrorId());
-    }
-    
-  }
-}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/SpringBootBasicConfigurationProviderTest.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/SpringBootBasicConfigurationProviderTest.java
deleted file mode 100644
index 4e7e7dd2..00000000
--- a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/SpringBootBasicConfigurationProviderTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package at.asitplus.eidas.specific.connector.test.config;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
-import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {
-    "/SpringTest-context_basic_realConfig.xml"})
-@TestPropertySource(locations = { "/config/junit_config_1.properties" })
-@ActiveProfiles("springBoot")
-@DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
-public class SpringBootBasicConfigurationProviderTest {
-
- @Autowired private IConfigurationWithSP basicConfig;
- 
-  @Test
-  public void configPropInfos() {
-    Assert.assertEquals("size", 2, MsEidasNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST.size());
-    
-  }
-  
-  @Test
-  public void loadSpNoExist() throws EaafConfigurationException {
-    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
-        RandomStringUtils.randomAlphabetic(5));
-    Assert.assertNull("spConfig", spConfig);
-    
-  }
-  
-  @Test
-  public void loadSpConfigBasicMode() throws EaafConfigurationException {
-    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration("jUnitTest1");
-    
-    Assert.assertNotNull("spConfig", spConfig);
-    Assert.assertEquals("uniqueId", "jUnitTest1", spConfig.getUniqueIdentifier());
-    Assert.assertEquals("friendlyName", "NO FRIENDLYNAME SET", spConfig.getFriendlyName());
-    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
-    String test = RandomStringUtils.randomAlphabetic(5);
-    Assert.assertEquals("pvp2.password", "1234pass", 
-        spConfig.getConfigurationValue("pvp2.metadata.truststore.password", test));
-    Assert.assertEquals("eidMode", true, spConfig.isConfigurationValue("newEidMode"));
-    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
-    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
-    Assert.assertEquals("fullConfig", 4, spConfig.getFullConfiguration().size());
-    
-  }
-  
-  @Test
-  public void loadSpConfigAdvancedMode() throws EaafConfigurationException {
-    ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(
-        "jUnitTest2", ServiceProviderConfiguration.class);
-    
-    Assert.assertNotNull("spConfig", spConfig);
-    Assert.assertEquals("uniqueId", "jUnitTest2", spConfig.getUniqueIdentifier());
-    Assert.assertEquals("friendlyName", "jUnit tester 2", spConfig.getFriendlyName());
-    Assert.assertEquals("pvp2.truststore", "", spConfig.getConfigurationValue("pvp2.metadata.truststore"));
-    String test = RandomStringUtils.randomAlphabetic(5);
-    Assert.assertEquals("pvp2.password", test, 
-        spConfig.getConfigurationValue("pvp2.metadata.truststore.notexist", test));
-    Assert.assertEquals("eidMode", false, spConfig.isConfigurationValue("newEidMode"));
-    Assert.assertEquals("notexistflag", false, spConfig.isConfigurationValue("notexist", false));
-    Assert.assertNotNull("fullConfig", spConfig.getFullConfiguration());
-    Assert.assertEquals("fullConfig", 5, spConfig.getFullConfiguration().size());
-    Assert.assertFalse("baseIdInternal", spConfig.hasBaseIdInternalProcessingRestriction());
-    Assert.assertTrue("baseIdTransfer", spConfig.hasBaseIdTransferRestriction());
-    
-  }
-  
-  @Test
-  public void loadSpConfigAdvancedModeWrongDecorator() throws EaafConfigurationException {
-    ISpConfiguration spConfig1 = basicConfig.getServiceProviderConfiguration(
-        "jUnitTest2", null);    
-    Assert.assertNull("spConfig", spConfig1);
-
-    String spConfig2 = basicConfig.getServiceProviderConfiguration(
-        "jUnitTest2", String.class);    
-    Assert.assertNull("spConfig", spConfig2);
-    
-  }
-  
-  @Test
-  public void loadConfigValuesString() {
-    Assert.assertEquals("without default", "ownSpecificConnector", 
-        basicConfig.getBasicConfiguration("auth.eIDAS.node_v2.entityId"));
-    
-    Assert.assertEquals("with default", "", 
-        basicConfig.getBasicConfiguration("auth.eIDAS.szrclient.endpoint.prod", 
-            RandomStringUtils.randomAlphabetic(5)));
-    
-    String rand1 = RandomStringUtils.randomAlphanumeric(5);
-    Assert.assertEquals("unknown with default", rand1, 
-        basicConfig.getBasicConfiguration("notexist", rand1));
-    
-  }
-  
-  @Test
-  public void loadConfigValuesBoolean() {
-    Assert.assertEquals("without default", true, 
-        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.useTestService"));
-    
-    Assert.assertEquals("not exist with default", false, 
-        basicConfig.getBasicConfigurationBoolean("auth.notexist", 
-            false));
-    
-    Assert.assertEquals("exist but empty with default", true, 
-        basicConfig.getBasicConfigurationBoolean("auth.eIDAS.szrclient.params.vkz", true));
-    
-  }
-  
-  @Test
-  public void loadConfigMap() {
-    Map<String, String> entries = basicConfig.getBasicConfigurationWithPrefix("auth.eIDAS.szrclient");
-    Assert.assertEquals("wrong size", 16, entries.size());
-    Assert.assertTrue("missing element", entries.containsKey("endpoint.test"));
-    Assert.assertEquals("wrong entry", "http://localhost:1234/demoszr", entries.get("endpoint.test"));
-    
-  }
-  
-  @Test
-  public void validateUrl() throws MalformedURLException, EaafException {
-    Assert.assertEquals("wrong URL", "http://localhost/test", 
-        basicConfig.validateIdpUrl(new URL("http://localhost/test/" + RandomStringUtils.randomAlphabetic(5))));
-   
-    Assert.assertNull("wrong URL",
-        basicConfig.validateIdpUrl(new URL("http://localhost/wrong/" + RandomStringUtils.randomAlphabetic(5))));
-    
-  }
-}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummyConfigMap.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummyConfigMap.java
deleted file mode 100644
index 42e31377..00000000
--- a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummyConfigMap.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package at.asitplus.eidas.specific.connector.test.config.dummy;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
-import at.gv.egiz.eaaf.core.test.dummy.DummyAuthConfigMap;
-import lombok.Setter;
-
-/**
- * MS-Connector specific dummy basic-config implementation.
- * 
- * @author tlenz
- *
- */
-public class MsConnectorDummyConfigMap extends DummyAuthConfigMap {
-
-  private static final String CONFIG_PREFIX = "eidas.ms.";
-  
-  @Setter
-  private String configRootDirSufix;
-  
-  /**
-   * Creates an emptry configuration.
-   *
-   */
-  public MsConnectorDummyConfigMap() {
-
-  }
-
-  /**
-   * Dummy Application-configuration.
-   *
-   * @param configIs Property based configuration
-   * @throws IOException In case of an configuration read error
-   */
-  public MsConnectorDummyConfigMap(final InputStream configIs) throws IOException {
-    super(configIs);
-
-  }
-
-  /**
-   * Dummy Application-configuration.
-   *
-   * @param path Path to property based configuration
-   * @throws IOException In case of an configuration read error
-   */
-  public MsConnectorDummyConfigMap(final String path) throws IOException {
-    super(path);
-
-  }
-  
-  
-  @Override
-  public String getBasicConfiguration(final String key) {
-    return super.getBasicConfiguration(addPrefixToKey(key));
-
-  }
-  
-  @Override
-  public Map<String, String> getBasicConfigurationWithPrefix(final String prefix) {
-    return super.getBasicConfigurationWithPrefix(addPrefixToKey(prefix));
-
-  }
-  
-  @Override
-  public void putConfigValue(final String key, final String value) {
-    super.putConfigValue(addPrefixToKey(key), value);
-  }
-
-  @Override
-  public void removeConfigValue(final String key) {
-    super.removeConfigValue(addPrefixToKey(key));
-
-  }
-  
-  @Override
-  public URI getConfigurationRootDirectory() {
-    URI basePath = super.getConfigurationRootDirectory();
-    if (StringUtils.isNotEmpty(configRootDirSufix)) {
-     try {
-      return new URI(basePath.toString() + configRootDirSufix);
-            
-    } catch (URISyntaxException e) {
-      throw new RuntimeException("Wrong Dummyconfig", e);
-      
-    } 
-      
-    } else {    
-      return basePath;
-      
-    }
-    
-
-  }
-  
-  private String addPrefixToKey(final String key) {
-    if (key.startsWith(CONFIG_PREFIX)) {
-      return key;
-      
-    }  else {
-      return CONFIG_PREFIX + key;
-      
-    }
-  }
-
-         
-}
diff --git a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummySpConfiguration.java b/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummySpConfiguration.java
deleted file mode 100644
index b379080d..00000000
--- a/connector_lib/src/test/java/at/asitplus/eidas/specific/connector/test/config/dummy/MsConnectorDummySpConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.asitplus.eidas.specific.connector.test.config.dummy;
-
-import java.util.List;
-import java.util.Map;
-
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
-import lombok.Setter;
-
-public class MsConnectorDummySpConfiguration extends DummySpConfiguration {
-  
-  private static final long serialVersionUID = -3249018889871026127L;
-
-  @Setter
-  private List<String> loa;
-  
-  public MsConnectorDummySpConfiguration(Map<String, String> spConfig, IConfiguration authConfig) {
-    super(spConfig, authConfig);
-
-  }
-  
-  @Override
-  public List<String> getRequiredLoA() {
-    return loa;
-    
-  }
-
-}
diff --git a/connector_lib/src/test/resources/SpringTest-context_basic_realConfig.xml b/connector_lib/src/test/resources/SpringTest-context_basic_realConfig.xml
deleted file mode 100644
index fbc4640a..00000000
--- a/connector_lib/src/test/resources/SpringTest-context_basic_realConfig.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:tx="http://www.springframework.org/schema/tx"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
-  <context:annotation-config />
-
-  <beans profile="!springBoot">
-  <bean id="BasicMSSpecificNodeConfig"
-    class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">
-    <constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
-  </bean>
-  </beans>
-  <beans profile="springBoot">
-    <bean id="springBootMsSpecificNodeConfig"
-          class="at.asitplus.eidas.specific.connector.config.SpringBootBasicConfigurationProvider" />
-  </beans>
-
-</beans>
\ No newline at end of file
diff --git a/connector_lib/src/test/resources/config/junit_config_1.properties b/connector_lib/src/test/resources/config/junit_config_1.properties
deleted file mode 100644
index 160725d4..00000000
--- a/connector_lib/src/test/resources/config/junit_config_1.properties
+++ /dev/null
@@ -1,124 +0,0 @@
-## Basic service configuration
-eidas.ms.context.url.prefix=http://localhost/test/
-eidas.ms.context.url.request.validation=true
-eidas.ms.core.configRootDir=file:./src/test/resources/config/
-
-eidas.ms.context.use.clustermode=true
-
-##Monitoring
-eidas.ms.monitoring.eIDASNode.metadata.url=
-
-
-##Specific logger configuration
-eidas.ms.technicallog.write.MDS.into.techlog=true
-eidas.ms.revisionlog.write.MDS.into.revisionlog=true
-eidas.ms.revisionlog.logIPAddressOfUser=true
-
-##Directory for static Web content
-eidas.ms.webcontent.static.directory=webcontent/
-eidas.ms.webcontent.templates=templates/
-eidas.ms.webcontent.properties=properties/messages
-
-## extended validation of pending-request Id's
-eidas.ms.core.pendingrequestid.maxlifetime=300
-eidas.ms.core.pendingrequestid.digist.algorithm=HmacSHA256
-eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret
-
-## eIDAS Ref. Implementation connector ###
-eidas.ms.auth.eIDAS.node_v2.entityId=ownSpecificConnector
-eidas.ms.auth.eIDAS.node_v2.forward.endpoint=
-eidas.ms.auth.eIDAS.node_v2.forward.method=POST
-eidas.ms.auth.eIDAS.node_v2.countrycode=AT
-eidas.ms.auth.eIDAS.node_v2.publicSectorTargets=.*
-eidas.ms.auth.eIDAS.node_v2.workarounds.addAlwaysProviderName=true
-eidas.ms.auth.eIDAS.node_v2.workarounds.useRequestIdAsTransactionIdentifier=true
-eidas.ms.auth.eIDAS.node_v2.workarounds.useStaticProviderNameForPublicSPs=true
-eidas.ms.auth.eIDAS.node_v2.staticProviderNameForPublicSPs=myNode
-
-eidas.ms.auth.eIDAS.node_v2.loa.requested.minimum=http://eidas.europa.eu/LoA/high
-
-eidas.ms.auth.eIDAS.szrclient.useTestService=true
-eidas.ms.auth.eIDAS.szrclient.endpoint.prod=
-eidas.ms.auth.eIDAS.szrclient.endpoint.test=http://localhost:1234/demoszr
-eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.path=keys/.....
-eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password=
-eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.path=
-eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.password=
-eidas.ms.auth.eIDAS.szrclient.timeout.connection=15
-eidas.ms.auth.eIDAS.szrclient.timeout.response=30
-eidas.ms.auth.eIDAS.szrclient.params.vkz=
-
-eidas.ms.auth.eIDAS.szrclient.params.useSZRForbPKCalculation=false
-
-
-eidas.ms.auth.eIDAS.authblock.keystore.password=f/+saJBc3a}*/T^s
-eidas.ms.auth.eIDAS.authblock.keystore.friendlyName=connectorkeypair
-eidas.ms.auth.eIDAS.authblock.keystore.path=./../keystore/teststore.jks
-eidas.ms.auth.eIDAS.authblock.keystore.type=jks
-eidas.ms.auth.eIDAS.authblock.key.alias=connectorkeypair
-eidas.ms.auth.eIDAS.authblock.key.password=f/+saJBc3a}*/T^s
-
-
-#Raw eIDAS Id data storage
-eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true
-
-eidas.ms.auth.eIDAS.szrclient.params.setPlaceOfBirthIfAvailable=true
-eidas.ms.auth.eIDAS.szrclient.params.setBirthNameIfAvailable=true
-
-eidas.ms.auth.eIDAS.szrclient.debug.logfullmessages=true
-eidas.ms.auth.eIDAS.szrclient.debug.useDummySolution=true
-
-##without mandates
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.0=PersonIdentifier,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.1=FamilyName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.2=FirstName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.3=DateOfBirth,true
-
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.4=PlaceOfBirth,false
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.5=BirthName,false
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.6=Gender,false
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.7=CurrentAddress,false
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.8=testtest,false
-
-##with mandates ---- NOT FULLY SUPPORTED AT THE MOMENT -----
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.0=PersonIdentifier,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.1=FamilyName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.2=FirstName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.3=DateOfBirth,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.4=LegalPerson,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.5=LegalName,true
-
-
-## PVP2 S-Profile end-point configuration
-eidas.ms.pvp2.keystore.path=keys/.....
-eidas.ms.pvp2.keystore.password=
-eidas.ms.pvp2.key.metadata.alias=
-eidas.ms.pvp2.key.metadata.password=
-eidas.ms.pvp2.key.signing.alias=
-eidas.ms.pvp2.key.signing.password=
-eidas.ms.pvp2.metadata.validity=24
-
-## Service Provider configuration
-eidas.ms.sp.0.uniqueID=jUnitTest1
-eidas.ms.sp.0.pvp2.metadata.truststore=
-eidas.ms.sp.0.pvp2.metadata.truststore.password=1234pass
-eidas.ms.sp.0.newEidMode=true
-
-eidas.ms.sp.1.uniqueID=jUnitTest2
-eidas.ms.sp.1.friendlyName=jUnit tester 2
-eidas.ms.sp.1.pvp2.metadata.truststore=
-eidas.ms.sp.1.pvp2.metadata.truststore.password=
-eidas.ms.sp.1.newEidMode=false
-
-#eidas.ms.sp.0.friendlyName=
-#eidas.ms.sp.0.pvp2.metadata.url=
-#eidas.ms.sp.0.policy.allowed.requested.targets=.*
-#eidas.ms.sp.0.policy.hasBaseIdTransferRestriction=false
-
-
-##only for advanced config
-eidas.ms.configuration.sp.disableRegistrationRequirement=
-eidas.ms.configuration.restrictions.baseID.spTransmission=
-eidas.ms.configuration.auth.default.countrycode=
-eidas.ms.configuration.pvp.scheme.validation=
-eidas.ms.configuration.pvp.enable.entitycategories=
\ No newline at end of file