feat: rename all configurations

wearefrank · Apr 10, 2024 · 8a495f0 · 8a495f0
1 parent 8271062
commit 8a495f0
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 53 deletions.
diff --git a/src/main/configurations/morcore2ultimo/Configuration.xml b/src/main/configurations/morcore2ultimo/Configuration.xml
@@ -1,13 +1,13 @@
 <!DOCTYPE Configuration [
-	<!ENTITY TaakApplicatieApi SYSTEM "./Configuration_TaakApplicatieApi.xml">
-	<!ENTITY TaakApi SYSTEM "./Configuration_TaakApi.xml">
-	<!ENTITY ESBZGWApi SYSTEM "./Configuration_ESBZGWApi.xml">
-	<!ENTITY NotificatieApi SYSTEM "./Configuration_NotificatieApi.xml">
+	<!ENTITY FromMorCore SYSTEM "./Configuration_FromMorCore.xml">
+	<!ENTITY ToMorCore SYSTEM "./Configuration_ToMorCore.xml">
+	<!ENTITY ToUltimo SYSTEM "./Configuration_ToUltimo.xml">
+	<!ENTITY FromUltimo SYSTEM "./Configuration_FromUltimo.xml">
 ]>
 
 <Configuration name="morcore2ultimo">
-	&TaakApplicatieApi;
-	&TaakApi;
-	&ESBZGWApi;
-	&NotificatieApi;
+	&FromMorCore;
+	&ToMorCore;
+	&ToUltimo;
+	&FromUltimo;
 </Configuration>
diff --git a/...ltimo/Configuration_TaakApplicatieApi.xml → ...core2ultimo/Configuration_FromMorCore.xml b/...ltimo/Configuration_TaakApplicatieApi.xml → ...core2ultimo/Configuration_FromMorCore.xml
@@ -88,7 +88,7 @@
             </XmlValidatorPipe>
 
             <SenderPipe name="SwitchConfiguration">
-                <IbisLocalSender javaListener="ESB_PostZaak" />
+                <IbisLocalSender javaListener="Ultimo_PostZaak" />
             </SenderPipe>
         </Pipeline>
     </Adapter>
@@ -118,7 +118,7 @@
             </XmlValidatorPipe>
 
             <SenderPipe name="SwitchConfiguration">
-                <IbisLocalSender javaListener="ESB_DeleteZaak">
+                <IbisLocalSender javaListener="Ultimo_DeleteZaak">
                     <Param name="uuid" sessionKey="uuid" />
                 </IbisLocalSender>
             </SenderPipe>
@@ -139,7 +139,7 @@
             </Exits>
 
             <SenderPipe name="SwitchConfiguration">
-                <IbisLocalSender javaListener="ESB_GetZaak">
+                <IbisLocalSender javaListener="Ultimo_GetZaak">
                     <Param name="uuid" sessionKey="uuid" />
                 </IbisLocalSender>
             </SenderPipe>

diff --git a/...e2ultimo/Configuration_NotificatieApi.xml → ...rcore2ultimo/Configuration_FromUltimo.xml b/...e2ultimo/Configuration_NotificatieApi.xml → ...rcore2ultimo/Configuration_FromUltimo.xml
@@ -20,7 +20,7 @@
             <JsonPipe name="RequestJson2Xml" />
 
             <SenderPipe name="RequestGetZaak" storeResultInSessionKey="JsonMessage">
-                <IbisLocalSender name="RequestGetZaak" javaListener="ESB_GetZaak_Internal" />
+                <IbisLocalSender name="RequestGetZaak" javaListener="Ultimo_GetZaak_Internal" />
             </SenderPipe>
 
             <JsonPipe name="ResponseJson2Xml" />

diff --git a/.../morcore2ultimo/Configuration_TaakApi.xml → ...orcore2ultimo/Configuration_ToMorCore.xml b/.../morcore2ultimo/Configuration_TaakApi.xml → ...orcore2ultimo/Configuration_ToMorCore.xml
diff --git a/...orcore2ultimo/Configuration_ESBZGWApi.xml → ...morcore2ultimo/Configuration_ToUltimo.xml b/...orcore2ultimo/Configuration_ESBZGWApi.xml → ...morcore2ultimo/Configuration_ToUltimo.xml
@@ -1,8 +1,8 @@
 <Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
-    <Adapter name="ESB_DeleteZaak">
-        <Receiver name="ESB_DeleteZaak">
-            <JavaListener name="ESB_DeleteZaak" />
+    <Adapter name="Ultimo_DeleteZaak">
+        <Receiver name="Ultimo_DeleteZaak">
+            <JavaListener name="Ultimo_DeleteZaak" />
         </Receiver>
 
         <Pipeline>
@@ -50,20 +50,20 @@
             </XsltPipe>
 
             <XsltPipe name="CreateDeleteZaakRequest" getInputFromSessionKey="originalMessage"
-                styleSheetName="xsl/ESBZGWApi/DeleteZaakRequest.xsl">
+                styleSheetName="xsl/Ultimo/DeleteZaakRequest.xsl">
                 <Param name="esuitesReference" sessionKey="esuitesReference" />
                 <Param name="currentDate" sessionKey="systemDate" />
                 <Forward name="success" path="XmlToJson" />
                 <Forward name="exception" path="exception" />
             </XsltPipe>
 
             <JsonPipe name="XmlToJson" direction="XML2JSON">
-                <Forward name="success" path="SendToESB" />
+                <Forward name="success" path="SendToUltimo" />
                 <Forward name="exception" path="exception" />
             </JsonPipe>
 
-            <SenderPipe name="SendToESB">
-                <HttpSender name="SendToESB" methodType="POST"
+            <SenderPipe name="SendToUltimo">
+                <HttpSender name="SendToUltimo" methodType="POST"
                     headersParams="X-Audit-Toelichting"
                     keystore="${Esuites.keystore}"
                     keystoreType="${Esuites.keystoreType}"
@@ -77,7 +77,7 @@
                     truststorePassword="${Esuites.truststorePassword}"
                     truststoreType="${Esuites.truststoreType}">
                     <Param name="X-Audit-Toelichting" sessionKey="toelichtingHeader" />
-                    <Param name="url" value="${Esuites.ESB.root-url}/statussen" />
+                    <Param name="url" value="${Esuites.Ultimo.root-url}/statussen" />
                 </HttpSender>
                 <Forward name="success" path="Exit" />
                 <Forward name="exception" path="exception" />
@@ -105,9 +105,9 @@
         </Pipeline>
     </Adapter>
 
-    <Adapter name="ESB_PostZaak">
-        <Receiver name="ESB_PostZaak">
-            <JavaListener name="ESB_PostZaak" />
+    <Adapter name="Ultimo_PostZaak">
+        <Receiver name="Ultimo_PostZaak">
+            <JavaListener name="Ultimo_PostZaak" />
         </Receiver>
 
         <Pipeline>
@@ -144,20 +144,20 @@
             </SenderPipe>
 
             <XsltPipe name="CreatePostZaakRequest"
-                styleSheetName="xsl/ESBZGWApi/PostZaakRequest.xsl"
+                styleSheetName="xsl/Ultimo/PostZaakRequest.xsl"
                 getInputFromSessionKey="originalMessage">
                 <Param name="currentDate" sessionKey="systemDate" />
                 <Param name="meldingInfo" sessionKey="meldingInfo" />
                 <Param name="opdrachtInfo" sessionKey="opdrachtInfo" />
             </XsltPipe>
 
             <JsonPipe name="XmlToJson" direction="XML2JSON">
-                <Forward name="success" path="SendToESB" />
+                <Forward name="success" path="SendToUltimo" />
                 <Forward name="exception" path="exception" />
             </JsonPipe>
 
-            <SenderPipe name="SendToESB">
-                <HttpSender name="SendToESB" methodType="POST"
+            <SenderPipe name="SendToUltimo">
+                <HttpSender name="SendToUltimo" methodType="POST"
                     headersParams="Accept-Crs,Content-Crs"
                     keystore="${Esuites.keystore}"
                     keystoreType="${Esuites.keystoreType}"
@@ -172,7 +172,7 @@
                     truststoreType="${Esuites.truststoreType}">
                     <Param name="Accept-Crs" value="EPSG:4326" />
                     <Param name="Content-Crs" value="EPSG:4326" />
-                    <Param name="url" value="${Esuites.ESB.root-url}/zaken" />
+                    <Param name="url" value="${Esuites.Ultimo.root-url}/zaken" />
                 </HttpSender>
                 <Forward name="success" path="Exit" />
                 <Forward name="exception" path="exception" />
@@ -200,13 +200,13 @@
         </Pipeline>
     </Adapter>
 
-    <Adapter name="ESB_GetZaak">
-        <Receiver name="ESB_GetZaak">
-            <JavaListener name="ESB_GetZaak" />
+    <Adapter name="Ultimo_GetZaak">
+        <Receiver name="Ultimo_GetZaak">
+            <JavaListener name="Ultimo_GetZaak" />
         </Receiver>
 
-        <Receiver name="ESB_GetZaak_Internal">
-            <JavaListener name="ESB_GetZaak_Internal" />
+        <Receiver name="Ultimo_GetZaak_Internal">
+            <JavaListener name="Ultimo_GetZaak_Internal" />
         </Receiver>
 
         <Pipeline>
@@ -218,8 +218,8 @@
                 <Exit name="ServerError" state="ERROR" code="500" />
             </Exits>
 
-            <SenderPipe name="SendToESB">
-                <HttpSender name="SendToESB" methodType="GET"
+            <SenderPipe name="SendToUltimo">
+                <HttpSender name="SendToUltimo" methodType="GET"
                     headersParams="Accept-Crs,Content-Crs"
                     keystore="${Esuites.keystore}"
                     keystoreType="${Esuites.keystoreType}"
@@ -238,7 +238,7 @@
                     <Param
                         name="uuid" sessionKey="uuid" />
                     <Param name="url"
-                        value="${Esuites.ESB.root-url}/zaken/${uuid}" />
+                        value="${Esuites.Ultimo.root-url}/zaken/${uuid}" />
                 </HttpSender>
                 <Forward name="success" path="Json2XML" />
                 <Forward name="exception" path="exception" />
@@ -252,7 +252,7 @@
                 <Forward name="exception" path="exception" />
             </JsonPipe>
 
-            <XsltPipe name="CreateGetZaakRequest" styleSheetName="xsl/ESBZGWApi/GetZaakResponse.xsl">
+            <XsltPipe name="CreateGetZaakRequest" styleSheetName="xsl/Ultimo/GetZaakResponse.xsl">
                 <Param name="currentDate" sessionKey="systemDate" />
                 <Forward name="success" path="Xml2Json" />
                 <Forward name="exception" path="exception" />
@@ -307,7 +307,7 @@
                     truststoreType="${Esuites.truststoreType}">
                     <Param name="Accept-Crs" value="EPSG:4326" />
                     <Param name="Content-Crs" value="EPSG:4326" />
-                    <Param name="url" value="${Esuites.ESB.root-url}/zaken" />
+                    <Param name="url" value="${Esuites.Ultimo.root-url}/zaken" />
                 </HttpSender>
             </SenderPipe>
         </Pipeline>

diff --git a/...ltimo/xsl/ESBZGWApi/DeleteZaakRequest.xsl → ...e2ultimo/xsl/Ultimo/DeleteZaakRequest.xsl b/...ltimo/xsl/ESBZGWApi/DeleteZaakRequest.xsl → ...e2ultimo/xsl/Ultimo/DeleteZaakRequest.xsl
diff --git a/...2ultimo/xsl/ESBZGWApi/GetZaakResponse.xsl → ...ore2ultimo/xsl/Ultimo/GetZaakResponse.xsl b/...2ultimo/xsl/ESBZGWApi/GetZaakResponse.xsl → ...ore2ultimo/xsl/Ultimo/GetZaakResponse.xsl
diff --git a/...2ultimo/xsl/ESBZGWApi/PostZaakRequest.xsl → ...ore2ultimo/xsl/Ultimo/PostZaakRequest.xsl b/...2ultimo/xsl/ESBZGWApi/PostZaakRequest.xsl → ...ore2ultimo/xsl/Ultimo/PostZaakRequest.xsl
diff --git a/src/test/testtool/common.properties b/src/test/testtool/common.properties
@@ -23,8 +23,8 @@ PostNotificatie.Input.serviceName=testtool-Frank_PostNotificatie
 MorCore.Response.className=nl.nn.adapterframework.receivers.JavaListener
 MorCore.Response.serviceName= testtool-Send2MorCore
 
-ESB.Response.className=nl.nn.adapterframework.receivers.JavaListener
-ESB.Response.serviceName=testtool-SendToESB
+Ultimo.Response.className=nl.nn.adapterframework.receivers.JavaListener
+Ultimo.Response.serviceName=testtool-SendToUltimo
 
 GetMelding.Input.className=nl.nn.adapterframework.senders.IbisJavaSender
 GetMelding.Input.serviceName=testtool-MorCore_GetMelding
@@ -33,8 +33,8 @@ GetMeldingTaak.Input.className=nl.nn.adapterframework.senders.IbisJavaSender
 GetMeldingTaak.Input.serviceName=testtool-MorCore_GetTaakOpdracht
 
 # --- Temporary ---
-ESB.RequestMeldingInfo.className=nl.nn.adapterframework.receivers.JavaListener
-ESB.RequestMeldingInfo.serviceName=testtool-RequestMeldingInfo
+Ultimo.RequestMeldingInfo.className=nl.nn.adapterframework.receivers.JavaListener
+Ultimo.RequestMeldingInfo.serviceName=testtool-RequestMeldingInfo
 
-ESB.RequestOpdrachtInfo.className=nl.nn.adapterframework.receivers.JavaListener
-ESB.RequestOpdrachtInfo.serviceName=testtool-RequestOpdrachtInfo
+Ultimo.RequestOpdrachtInfo.className=nl.nn.adapterframework.receivers.JavaListener
+Ultimo.RequestOpdrachtInfo.serviceName=testtool-RequestOpdrachtInfo
diff --git a/src/test/testtool/scenario01-PostZaak.properties b/src/test/testtool/scenario01-PostZaak.properties
@@ -7,6 +7,6 @@ step2.MorCore.Response.read             = ignore
 step3.MorCore.Response.write            = scenario01/MorcoreMeldingInfoResponse.json
 step4.MorCore.Response.read             = ignore
 step5.MorCore.Response.write            = scenario01/MorcoreOpdrachtInfoResponse.json
-step6.ESB.Response.read                 = ignore
-step7.ESB.Response.write                = scenario01/ESBPostZaakResponse.json
+step6.Ultimo.Response.read              = ignore
+step7.Ultimo.Response.write             = scenario01/UltimoPostZaakResponse.json
 step8.PostTaak.Input.read               = scenario01/Output.json
diff --git a/...sttool/scenario01/ESBPostZaakRequest.json → ...ool/scenario01/UltimoPostZaakRequest.json b/...sttool/scenario01/ESBPostZaakRequest.json → ...ool/scenario01/UltimoPostZaakRequest.json
diff --git a/...ttool/scenario01/ESBPostZaakResponse.json → ...ol/scenario01/UltimoPostZaakResponse.json b/...ttool/scenario01/ESBPostZaakResponse.json → ...ol/scenario01/UltimoPostZaakResponse.json
diff --git a/src/test/testtool/scenario02-DeleteZaak.properties b/src/test/testtool/scenario02-DeleteZaak.properties
@@ -5,6 +5,6 @@ include = common.properties
 step1.DeleteTaak.Input.write        = scenario02/Input.json
 step2.MorCore.Response.read         = ignore
 step3.MorCore.Response.write        = scenario02/GetMeldingResponse.json
-step4.ESB.Response.read             = scenario02/SentToESB.json
-step5.ESB.Response.write            = scenario02/ESBResponse.json
+step4.Ultimo.Response.read          = scenario02/SentToUltimo.json
+step5.Ultimo.Response.write         = scenario02/UltimoResponse.json
 step6.DeleteTaak.Input.read         = scenario02/Output.json
diff --git a/src/test/testtool/scenario02/SentToESB.json → ...est/testtool/scenario02/SentToUltimo.json b/src/test/testtool/scenario02/SentToESB.json → ...est/testtool/scenario02/SentToUltimo.json
diff --git a/...test/testtool/scenario02/ESBResponse.json → ...t/testtool/scenario02/UltimoResponse.json b/...test/testtool/scenario02/ESBResponse.json → ...t/testtool/scenario02/UltimoResponse.json
diff --git a/src/test/testtool/scenario03-PostNotificatie.properties b/src/test/testtool/scenario03-PostNotificatie.properties
@@ -3,8 +3,8 @@ scenario.description = Happy Flow - Post Notificatie
 include= common.properties
 
 step1.PostNotificatie.Input.write   = scenario03/Input.json
-step2.ESB.Response.read             = ignore
-step3.ESB.Response.write            = scenario03/ESBResponse.json
+step2.Ultimo.Response.read          = ignore
+step3.Ultimo.Response.write         = scenario03/UltimoResponse.json
 step4.MorCore.Response.read         = ignore
-step5.MorCore.Response.write        = scenario03/ESBResponse.json
+step5.MorCore.Response.write        = scenario03/UltimoResponse.json
 step6.PostNotificatie.Input.read    = ignore
diff --git a/...test/testtool/scenario03/ESBResponse.json → ...t/testtool/scenario03/UltimoResponse.json b/...test/testtool/scenario03/ESBResponse.json → ...t/testtool/scenario03/UltimoResponse.json
diff --git a/src/test/testtool/scenario09-GetZaak.properties b/src/test/testtool/scenario09-GetZaak.properties
@@ -3,6 +3,6 @@ scenario.description = Happy Flow - Get Zaak
 include= common.properties
 
 step1.GetZaak.Input.write   = scenario09/Input.json
-step2.ESB.Response.read     = ignore
-step3.ESB.Response.write    = scenario09/ESBResponse.json
+step2.Ultimo.Response.read  = ignore
+step3.Ultimo.Response.write = scenario09/UltimoResponse.json
 step4.GetZaak.Input.read    = scenario09/Output.json
diff --git a/...test/testtool/scenario09/ESBResponse.json → ...t/testtool/scenario09/UltimoResponse.json b/...test/testtool/scenario09/ESBResponse.json → ...t/testtool/scenario09/UltimoResponse.json