diff options
Diffstat (limited to 'connector/src')
3 files changed, 29 insertions, 5 deletions
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"); } |