From da22429442937c0f17851ec437e1ac9facffd6d5 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Thu, 7 Nov 2024 00:26:40 +0100 Subject: [PATCH 1/6] First commit Signed-off-by: Thang PHAM --- .gitmodules | 4 ++++ backend/servers/pom.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/.gitmodules b/.gitmodules index 8cd7664..2f3c5ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,6 +178,10 @@ path = backend/servers/dynamic-simulation-server url = https://github.com/gridsuite/dynamic-simulation-server branch = main +[submodule "dynamic-security-analysis-server"] + path = backend/servers/dynamic-security-analysis-server + url = https://github.com/gridsuite/dynamic-security-analysis-server + branch = main [submodule "cgmes-boundary-import-job"] path = backend/jobs/cgmes-boundary-import-job url = https://github.com/gridsuite/cgmes-boundary-import-job diff --git a/backend/servers/pom.xml b/backend/servers/pom.xml index 95c0689..cc55eee 100644 --- a/backend/servers/pom.xml +++ b/backend/servers/pom.xml @@ -33,6 +33,7 @@ directory-server dynamic-mapping-server dynamic-simulation-server + dynamic-security-analysis-server explore-server filter-server gateway From 9628221ea49d35b3ba534b5c11e3c54dc0cfe643 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Thu, 7 Nov 2024 00:37:27 +0100 Subject: [PATCH 2/6] Second commit Signed-off-by: Thang PHAM --- backend/servers/dynamic-security-analysis-server/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 backend/servers/dynamic-security-analysis-server/.gitkeep diff --git a/backend/servers/dynamic-security-analysis-server/.gitkeep b/backend/servers/dynamic-security-analysis-server/.gitkeep new file mode 100644 index 0000000..e69de29 From 0b43744edd2bd829986a583716faa0b1a9dec254 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Thu, 7 Nov 2024 00:39:33 +0100 Subject: [PATCH 3/6] Third commit Signed-off-by: Thang PHAM --- backend/servers/dynamic-security-analysis-server/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 backend/servers/dynamic-security-analysis-server/.gitkeep diff --git a/backend/servers/dynamic-security-analysis-server/.gitkeep b/backend/servers/dynamic-security-analysis-server/.gitkeep deleted file mode 100644 index e69de29..0000000 From 1cf406181398ad952a623b9dee2a50ce949c5650 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Thu, 7 Nov 2024 11:22:33 +0100 Subject: [PATCH 4/6] Fourth commit Signed-off-by: Thang PHAM --- .gitmodules | 7 +++---- backend/servers/dynamic-security-analysis-server | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) create mode 160000 backend/servers/dynamic-security-analysis-server diff --git a/.gitmodules b/.gitmodules index 2f3c5ed..da0a046 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,10 +178,6 @@ path = backend/servers/dynamic-simulation-server url = https://github.com/gridsuite/dynamic-simulation-server branch = main -[submodule "dynamic-security-analysis-server"] - path = backend/servers/dynamic-security-analysis-server - url = https://github.com/gridsuite/dynamic-security-analysis-server - branch = main [submodule "cgmes-boundary-import-job"] path = backend/jobs/cgmes-boundary-import-job url = https://github.com/gridsuite/cgmes-boundary-import-job @@ -310,3 +306,6 @@ path = backend/servers/spreadsheet-config-server url = https://github.com/gridsuite/spreadsheet-config-server branch = main +[submodule "backend/servers/dynamic-security-analysis-server"] + path = backend/servers/dynamic-security-analysis-server + url = https://github.com/gridsuite/dynamic-security-analysis-server diff --git a/backend/servers/dynamic-security-analysis-server b/backend/servers/dynamic-security-analysis-server new file mode 160000 index 0000000..ae62b80 --- /dev/null +++ b/backend/servers/dynamic-security-analysis-server @@ -0,0 +1 @@ +Subproject commit ae62b801f360fae9b41afa55c302d7fba571e52c From 94aee537cd2be8bce033d84fe0ebbd895affb189 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Thu, 7 Nov 2024 11:26:02 +0100 Subject: [PATCH 5/6] Change order Signed-off-by: Thang PHAM --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index da0a046..bd1b726 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,6 +178,9 @@ path = backend/servers/dynamic-simulation-server url = https://github.com/gridsuite/dynamic-simulation-server branch = main +[submodule "backend/servers/dynamic-security-analysis-server"] + path = backend/servers/dynamic-security-analysis-server + url = https://github.com/gridsuite/dynamic-security-analysis-server [submodule "cgmes-boundary-import-job"] path = backend/jobs/cgmes-boundary-import-job url = https://github.com/gridsuite/cgmes-boundary-import-job @@ -306,6 +309,3 @@ path = backend/servers/spreadsheet-config-server url = https://github.com/gridsuite/spreadsheet-config-server branch = main -[submodule "backend/servers/dynamic-security-analysis-server"] - path = backend/servers/dynamic-security-analysis-server - url = https://github.com/gridsuite/dynamic-security-analysis-server From 853b242810236e8bfaaff737c20d4333cc94f0ce Mon Sep 17 00:00:00 2001 From: Thang PHAM <117309322+thangqp@users.noreply.github.com> Date: Fri, 15 Nov 2024 13:10:51 +0100 Subject: [PATCH 6/6] Update .gitmodules Co-authored-by: etiennehomer --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index bd1b726..75af7bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,7 +178,7 @@ path = backend/servers/dynamic-simulation-server url = https://github.com/gridsuite/dynamic-simulation-server branch = main -[submodule "backend/servers/dynamic-security-analysis-server"] +[submodule "dynamic-security-analysis-server"] path = backend/servers/dynamic-security-analysis-server url = https://github.com/gridsuite/dynamic-security-analysis-server [submodule "cgmes-boundary-import-job"]