refact(eidas): move eIDAS ref.impl configuration into MS-specific namespace

4 files changed, 11 insertions, 21 deletions

diff --git a/ms_specific_connector/src/main/resources/application.properties b/ms_specific_connector/src/main/resources/application.properties
index 5a31c119..310de06c 100644
--- a/ms_specific_connector/src/main/resources/application.properties
+++ b/ms_specific_connector/src/main/resources/application.properties
@@ -111,16 +111,16 @@ eidas.ms.auth.eIDAS.node_v2.loa.requested.minimum=http://eidas.europa.eu/LoA/hig
 #eidas.ms.auth.eIDAS.node_v2.loa.ua.requested=http://eidas.europa.eu/NotNotified/LoA/high
 
 
- # TODO change namespaces if required
-lightToken.connector.request.issuer.name=specificCommunicationDefinitionConnectorRequest
-lightToken.connector.request.node.id=specificConnector 
-lightToken.connector.request.secret=mySecretConnectorRequest
-lightToken.connector.request.algorithm=SHA-256
-lightToken.connector.response.issuer.name=specificCommunicationDefinitionConnectorResponse
-lightToken.connector.response.node.id=specificConnector
-lightToken.connector.response.secret=mySecretConnectorResponse
-lightToken.connector.response.algorithm=SHA-256
-incoming.lightRequest.max.number.characters=65535
+# eIDAS Ref. Impl. configuration properties
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.request.issuer.name=specificCommunicationDefinitionConnectorRequest
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.request.node.id=specificConnector 
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.request.secret=mySecretConnectorRequest
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.request.algorithm=SHA-256
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.response.issuer.name=specificCommunicationDefinitionConnectorResponse
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.response.node.id=specificConnector
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.response.secret=mySecretConnectorResponse
+eidas.ms.auth.eIDAS.node_v2.lightToken.connector.response.algorithm=SHA-256
+eidas.ms.auth.eIDAS.node_v2.incoming.lightRequest.max.number.characters=65535
 
 
 
diff --git a/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java b/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
index 02e4ee79..dc2f442b 100644
--- a/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
+++ b/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
@@ -175,8 +175,6 @@ public class FullStartUpAndProcessTest {
     System.clearProperty("eidas.ms.configuration");
 
     //eIDAS Ref. Impl. properties
-    System.setProperty("EIDAS_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
     System.setProperty("SPECIFIC_CONNECTOR_CONFIG_REPOSITORY", current.substring("file:".length())
         + "../basicConfig/eIDAS/");
 
diff --git a/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassExecutableModeTest.java b/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassExecutableModeTest.java
index 708560b2..9b8f0231 100644
--- a/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassExecutableModeTest.java
+++ b/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassExecutableModeTest.java
@@ -40,12 +40,8 @@ public class MainClassExecutableModeTest {
     System.clearProperty("eidas.ms.configuration");
     
     //eIDAS Ref. Impl. properties
-    System.setProperty("EIDAS_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
     System.setProperty("SPECIFIC_CONNECTOR_CONFIG_REPOSITORY", current.substring("file:".length())
         + "../basicConfig/eIDAS/");
-    System.setProperty("SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
         
   }
 
diff --git a/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassWebAppModeTest.java b/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassWebAppModeTest.java
index 79d062ae..551c4979 100644
--- a/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassWebAppModeTest.java
+++ b/ms_specific_connector/src/test/java/at/asitplus/eidas/specific/connector/test/MainClassWebAppModeTest.java
@@ -35,13 +35,9 @@ public class MainClassWebAppModeTest {
   public static void classInitializer() {
     final String current = new java.io.File(".").toURI().toString();
     
-    //eIDAS Ref. Impl. properties
-    System.setProperty("EIDAS_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
+    // eIDAS Ref. Impl. properties
     System.setProperty("SPECIFIC_CONNECTOR_CONFIG_REPOSITORY", current.substring("file:".length())
         + "../basicConfig/eIDAS/");
-    System.setProperty("SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
     
   }