From 43162aa18a62e6d86b331f5d34a0cc9e73052c3f Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Thu, 8 Aug 2024 11:51:29 +0300 Subject: [PATCH] xml-importer and xml-exporter added to z-distr --- pom.xml | 2 + z-distr/pom.xml | 46 +++++++++++++++++++ .../src/main/resources/distr/sh/kill_all.sh | 4 +- .../src/main/resources/distr/sh/launch_all.sh | 2 + .../main/resources/distr/sh/xml-exporter.sh | 9 ++++ .../main/resources/distr/sh/xml-importer.sh | 9 ++++ 6 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 z-distr/src/main/resources/distr/sh/xml-exporter.sh create mode 100644 z-distr/src/main/resources/distr/sh/xml-importer.sh diff --git a/pom.xml b/pom.xml index e9f73aa7b..58c235554 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,8 @@ ${folder_root_clearing}/clearing-parent/registry-service ${folder_root_clearing}/clearing-parent/scheduler-service ${folder_root_clearing}/clearing-parent/gateway-api + ${folder_root_clearing}/clearing-parent/xml-exporter + ${folder_root_clearing}/clearing-parent/xml-importer 3.12.4 1.7.33 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index c168e620a..9af0f0e1f 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -568,6 +568,52 @@ + + copy-xml-exporter-bin + prepare-package + + copy + + + + + ${folder_root_xml-exporter}/target/xml-exporter.jar + ${folder.clearing.distr.bin}/xml-exporter.jar + + + ${folder_root_xml-exporter}/target/xml-exporter.jar + ${folder.clearing.distr.services}/xml-exporter/xml-exporter.jar + + + ${folder_root_xml-exporter}/src/main/resources/application.properties + ${folder.clearing.distr.settings}/xml-exporter/application.properties + + + + + + copy-xml-importer-bin + prepare-package + + copy + + + + + ${folder_root_xml-importer}/target/xml-importer.jar + ${folder.clearing.distr.bin}/xml-importer.jar + + + ${folder_root_xml-importer}/target/xml-importer.jar + ${folder.clearing.distr.services}/xml-importer/xml-importer.jar + + + ${folder_root_xml-importer}/src/main/resources/application.properties + ${folder.clearing.distr.settings}/xml-importer/application.properties + + + + diff --git a/z-distr/src/main/resources/distr/sh/kill_all.sh b/z-distr/src/main/resources/distr/sh/kill_all.sh index 46da22a76..8e9a2a8a5 100644 --- a/z-distr/src/main/resources/distr/sh/kill_all.sh +++ b/z-distr/src/main/resources/distr/sh/kill_all.sh @@ -19,4 +19,6 @@ kill -9 $(ps -ef | grep java | grep scheduler-service.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep reports-service.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep registry-service.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep swt-importer.jar | awk '{print $2}') -kill -9 $(ps -ef | grep java | grep gateway-api.jar | awk '{print $2}') \ No newline at end of file +kill -9 $(ps -ef | grep java | grep gateway-api.jar | awk '{print $2}') +kill -9 $(ps -ef | grep java | grep xml-exporter.jar | awk '{print $2}') +kill -9 $(ps -ef | grep java | grep xml-importer.jar | awk '{print $2}') \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/sh/launch_all.sh b/z-distr/src/main/resources/distr/sh/launch_all.sh index 7447e407d..b4c6a45be 100644 --- a/z-distr/src/main/resources/distr/sh/launch_all.sh +++ b/z-distr/src/main/resources/distr/sh/launch_all.sh @@ -20,3 +20,5 @@ cd /opt/mfd/clearing/bin /opt/mfd/clearing/bin/registry-service.sh /opt/mfd/clearing/bin/swt-importer.sh /opt/mfd/clearing/bin/gateway-api.sh +/opt/mfd/clearing/bin/xml-exporter.sh +/opt/mfd/clearing/bin/xml-importer.sh diff --git a/z-distr/src/main/resources/distr/sh/xml-exporter.sh b/z-distr/src/main/resources/distr/sh/xml-exporter.sh new file mode 100644 index 000000000..862968408 --- /dev/null +++ b/z-distr/src/main/resources/distr/sh/xml-exporter.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +CLEARING_HOME=/opt/mfd/clearing/ +cd $CLEARING_HOME/bin + +CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7031 -jar xml-exporter.jar --spring.config.location=$CLEARING_HOME/settings/xml-exporter/" + +$CMD >/dev/null 2>&1 & + diff --git a/z-distr/src/main/resources/distr/sh/xml-importer.sh b/z-distr/src/main/resources/distr/sh/xml-importer.sh new file mode 100644 index 000000000..d4f0d9ec7 --- /dev/null +++ b/z-distr/src/main/resources/distr/sh/xml-importer.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +CLEARING_HOME=/opt/mfd/clearing/ +cd $CLEARING_HOME/bin + +CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7041 -jar xml-importer.jar --spring.config.location=$CLEARING_HOME/settings/xml-importer/" + +$CMD >/dev/null 2>&1 & +