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

2 files changed, 12 insertions, 15 deletions

diff --git a/ms_specific_proxyservice/src/main/resources/application.properties b/ms_specific_proxyservice/src/main/resources/application.properties
index d6918a97..aa285026 100644
--- a/ms_specific_proxyservice/src/main/resources/application.properties
+++ b/ms_specific_proxyservice/src/main/resources/application.properties
@@ -70,16 +70,16 @@ eidas.ms.auth.eIDAS.node_v2.proxy.forward.errors=false
 eidas.ms.auth.eIDAS.node_v2.forward.method=POST
 
 
- # TODO change namespaces if required
-lightToken.proxyservice.request.issuer.name=specificCommunicationDefinitionConnectorRequest
-lightToken.proxyservice.request.node.id=specificConnector 
-lightToken.proxyservice.request.secret=mySecretConnectorRequest
-lightToken.proxyservice.request.algorithm=SHA-256
-lightToken.proxyservice.response.issuer.name=specificCommunicationDefinitionConnectorResponse
-lightToken.proxyservice.response.node.id=specificConnector
-lightToken.proxyservice.response.secret=mySecretConnectorResponse
-lightToken.proxyservice.response.algorithm=SHA-256
-incoming.lightRequest.max.number.characters=65535
+ # eIDAS Ref. Impl. configuration properties
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.request.issuer.name=specificCommunicationDefinitionConnectorRequest
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.request.node.id=specificConnector 
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.request.secret=mySecretConnectorRequest
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.request.algorithm=SHA-256
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.response.issuer.name=specificCommunicationDefinitionConnectorResponse
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.response.node.id=specificConnector
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.response.secret=mySecretConnectorResponse
+eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.response.algorithm=SHA-256
+eidas.ms.auth.eIDAS.node_v2.incoming.lightRequest.max.number.characters=65535
 
 
 # Mandate configuration
diff --git a/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java b/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java
index c86fbd9b..42c2b830 100644
--- a/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java
+++ b/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java
@@ -127,11 +127,8 @@ public class FullStartUpAndProcessTest {
     final String current = new java.io.File(".").toURI().toString();
     System.clearProperty("eidas.ms-proxy.configuration");
 
-    //eIDAS Ref. Impl. properties
-    System.setProperty("EIDAS_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
-    System.setProperty("SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
+    System.setProperty("SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY",
+        current.substring("file:".length()) + "../basicConfig/eIDAS/");
 
     EaafOpenSaml3xInitializer.eaafInitialize();