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

9 files changed, 37 insertions, 50 deletions

diff --git a/modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml b/modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml
index fb17b857..1fa55e1c 100644
--- a/modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml
+++ b/modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml
@@ -31,16 +31,16 @@
   	</bean>
 
     <bean id="connectorRequestService" class="eu.eidas.specificcommunication.protocol.impl.RequestSpecificCommunicationServiceImpl" scope="prototype">
-        <constructor-arg index="0" type="java.lang.String" value="${lightToken.connector.request.issuer.name}"/>
-        <constructor-arg index="1" type="java.lang.String" value="${lightToken.connector.request.secret}"/>
-        <constructor-arg index="2" type="java.lang.String" value="${lightToken.connector.request.algorithm}"/>
+        <constructor-arg index="0" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.connector.request.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.connector.request.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.connector.request.algorithm}"/>
         <constructor-arg index="3" ref="specificNodeConnectorRequestCache"/>
     </bean>
 
     <bean id="connectorResponseService" class="eu.eidas.specificcommunication.protocol.impl.ResponseSpecificCommunicationServiceImpl" scope="prototype">
-        <constructor-arg index="0" type="java.lang.String" value="${lightToken.connector.response.issuer.name}"/>
-        <constructor-arg index="1" type="java.lang.String" value="${lightToken.connector.response.secret}"/>
-        <constructor-arg index="2" type="java.lang.String" value="${lightToken.connector.response.algorithm}"/>
+        <constructor-arg index="0" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.connector.response.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.connector.response.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.connector.response.algorithm}"/>
         <constructor-arg index="3" ref="nodeSpecificConnectorResponseCache"/>
     </bean>
 
diff --git a/modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml b/modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml
index ea2f5a7d..2b469d93 100644
--- a/modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml
+++ b/modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml
@@ -32,16 +32,16 @@
     </bean>
 
     <bean id="serviceRequestService" class="eu.eidas.specificcommunication.protocol.impl.RequestSpecificCommunicationServiceImpl" scope="prototype">
-        <constructor-arg index="0" type="java.lang.String" value="${lightToken.proxyservice.request.issuer.name}"/>
-        <constructor-arg index="1" type="java.lang.String" value="${lightToken.proxyservice.request.secret}"/>
-        <constructor-arg index="2" type="java.lang.String" value="${lightToken.proxyservice.request.algorithm}"/>
+        <constructor-arg index="0" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.request.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.request.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.request.algorithm}"/>
         <constructor-arg index="3" ref="nodeSpecificProxyserviceRequestCache"/>
     </bean>
 
     <bean id="serviceResponseService" class="eu.eidas.specificcommunication.protocol.impl.ResponseSpecificCommunicationServiceImpl" scope="prototype">
-        <constructor-arg index="0" type="java.lang.String" value="${lightToken.proxyservice.response.issuer.name}"/>
-        <constructor-arg index="1" type="java.lang.String" value="${lightToken.proxyservice.response.secret}"/>
-        <constructor-arg index="2" type="java.lang.String" value="${lightToken.proxyservice.response.algorithm}"/>
+        <constructor-arg index="0" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.response.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.response.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${eidas.ms.auth.eIDAS.node_v2.lightToken.proxyservice.response.algorithm}"/>
         <constructor-arg index="3" ref="specificNodeProxyserviceResponseCache"/>
     </bean>
 
diff --git a/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml b/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
index f0038a8e..37f5ffcb 100644
--- a/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
+++ b/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
@@ -25,11 +25,11 @@
   		class="eu.eidas.specificcommunication.SpecificCommunicationApplicationContextProvider" /> 
 
   <bean id="incomingLightRequestValidator" class="eu.eidas.specificcommunication.protocol.validation.IncomingLightRequestValidator">
-    <constructor-arg index="0" value="${incoming.lightRequest.max.number.characters:65535}"/>
+    <constructor-arg index="0" value="${eidas.ms.auth.eIDAS.node_v2.incoming.lightRequest.max.number.characters:65535}"/>
   </bean>
 
   <bean id="incomingLightResponseValidator" class="eu.eidas.specificcommunication.protocol.validation.IncomingLightResponseValidator">
-    <constructor-arg index="0" value="${incoming.lightResponse.max.number.characters:65535}"/>
+    <constructor-arg index="0" value="${eidas.ms.auth.eIDAS.node_v2.incoming.lightResponse.max.number.characters:65535}"/>
   </bean>
 
 </beans>
\ No newline at end of file
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/");
     
   }
 
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();