From 45b5c8925d41465d54e69ec4edb47b23dd1592d6 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 27 Sep 2023 14:22:33 +0200
Subject: refact(eidas): move eIDAS ref.impl configuration into MS-specific
 namespace

---
 .../src/main/resources/eidas_v27_connector.beans.xml         | 12 ++++++------
 .../src/main/resources/eidas_v27_proxyservice.beans.xml      | 12 ++++++------
 .../main/resources/eidas_v2_auth_ref_impl_config.beans.xml   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'modules')

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
-- 
cgit v1.2.3