diff options
| author | Thomas <> | 2022-06-03 16:02:01 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-06-03 16:02:01 +0200 |
| commit | 9d1d6626032aa59eb169e310ed239b94c0bc5447 (patch) | |
| tree | 4ecbdce1b177ae5380b0470555d4fb90297e26ff /connector | |
| parent | 7f0a925a72dc9841280e66fcba1515af62b9efdf (diff) | |
| download | National_eIDAS_Gateway-9d1d6626032aa59eb169e310ed239b94c0bc5447.tar.gz National_eIDAS_Gateway-9d1d6626032aa59eb169e310ed239b94c0bc5447.tar.bz2 National_eIDAS_Gateway-9d1d6626032aa59eb169e310ed239b94c0bc5447.zip | |
chore(config): split default configuration into MS-Connector and MS-Proxy-Servie
Diffstat (limited to 'connector')
4 files changed, 29 insertions, 13 deletions
diff --git a/connector/pom.xml b/connector/pom.xml index 8ec95612..17a54b5f 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -60,14 +60,6 @@ <groupId>at.asitplus.eidas.ms_specific.modules</groupId> <artifactId>authmodule-eIDAS-v2</artifactId> </dependency> - <dependency> - <groupId>at.asitplus.eidas.ms_specific.modules</groupId> - <artifactId>eidas_proxy-sevice</artifactId> - </dependency> - <dependency> - <groupId>at.asitplus.eidas.ms_specific.modules</groupId> - <artifactId>authmodule_id-austria</artifactId> - </dependency> <dependency> <groupId>at.gv.egiz.eaaf</groupId> diff --git a/connector/src/assembly/assembly_dir.xml b/connector/src/assembly/assembly_dir.xml index bc12a470..f7bd45a1 100644 --- a/connector/src/assembly/assembly_dir.xml +++ b/connector/src/assembly/assembly_dir.xml @@ -35,19 +35,31 @@ <outputDirectory>./config</outputDirectory> <excludes> <exclude>**/extconfig/**</exclude> + <exclude>**/ms-connector/**</exclude> + <exclude>**/ms-proxyservice/**</exclude> </excludes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/infos/</directory> + <directory>${project.parent.basedir}/basicConfig/ms-connector/</directory> + <outputDirectory>./config</outputDirectory> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/infos/ms-connector/</directory> <outputDirectory>./infos</outputDirectory> <includes> <!-- include>README.md</include--> <include>readme_${project.version}.txt</include> <include>readme_${project.version}.md</include> <include>history.txt</include> - <include>eIDAS_Ref_Impl/*</include> <include>handbook/*</include> </includes> </fileSet> + <fileSet> + <directory>${project.parent.basedir}/infos/</directory> + <outputDirectory>./infos</outputDirectory> + <includes> + <include>eIDAS_Ref_Impl/*</include> + </includes> + </fileSet> </fileSets> </assembly> diff --git a/connector/src/assembly/assembly_zip.xml b/connector/src/assembly/assembly_zip.xml index dcb7dab0..56d684c0 100644 --- a/connector/src/assembly/assembly_zip.xml +++ b/connector/src/assembly/assembly_zip.xml @@ -35,19 +35,31 @@ <outputDirectory>./config</outputDirectory> <excludes> <exclude>**/extconfig/**</exclude> + <exclude>**/ms-connector/**</exclude> + <exclude>**/ms-proxyservice/**</exclude> </excludes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/infos/</directory> + <directory>${project.parent.basedir}/basicConfig/ms-connector/</directory> + <outputDirectory>./config</outputDirectory> + </fileSet> + <fileSet> + <directory>${project.parent.basedir}/infos/ms-connector/</directory> <outputDirectory>./infos</outputDirectory> <includes> <!-- include>README.md</include --> <include>readme_${project.version}.txt</include> <include>readme_${project.version}.md</include> <include>history.txt</include> - <include>eIDAS_Ref_Impl/*</include> <include>handbook/*</include> </includes> </fileSet> + <fileSet> + <directory>${project.parent.basedir}/infos/</directory> + <outputDirectory>./infos</outputDirectory> + <includes> + <include>eIDAS_Ref_Impl/*</include> + </includes> + </fileSet> </fileSets> </assembly> diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/utils/CountrySelectionProcessImplTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/utils/CountrySelectionProcessImplTest.java index 368a8e4e..7d82c120 100644 --- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/utils/CountrySelectionProcessImplTest.java +++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/utils/CountrySelectionProcessImplTest.java @@ -48,7 +48,7 @@ public class CountrySelectionProcessImplTest { @BeforeClass public static void classInitializer() { final String current = new java.io.File(".").toURI().toString(); - System.setProperty("eidas.ms.configuration", current + "../basicConfig/default_config.properties"); + System.setProperty("eidas.ms.configuration", current + "../basicConfig/ms-connector/default_config.properties"); } |