aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-28 16:34:05 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-28 17:02:34 +0100
commitd9c6a5c8bf3cab0311fc25b38b308b22ec852a3e (patch)
tree996aa23899fa41fdc39ce550a6a19a70ee97ce24
parente229b7d5acafec28568fd8d45fbe86d8f215da69 (diff)
downloadNational_eIDAS_Gateway-d9c6a5c8bf3cab0311fc25b38b308b22ec852a3e.tar.gz
National_eIDAS_Gateway-d9c6a5c8bf3cab0311fc25b38b308b22ec852a3e.tar.bz2
National_eIDAS_Gateway-d9c6a5c8bf3cab0311fc25b38b308b22ec852a3e.zip
update SpringBoot application-initializer to enable package-scanning in application packages
-rw-r--r--connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java5
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java2
2 files changed, 5 insertions, 2 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java
index f0cf8698..1e84cbb0 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java
@@ -12,7 +12,10 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xIniti
import lombok.extern.slf4j.Slf4j;
@Slf4j
-@SpringBootApplication(scanBasePackages = {"at.gv.egiz.eaaf.utils.springboot.ajp"})
+@SpringBootApplication(scanBasePackages = {
+ "at.asitplus.eidas.specific.connector",
+ "at.gv.egiz.eaaf.utils.springboot.ajp"
+ })
public class SpringBootApplicationInitializer {
private static ConfigurableApplicationContext ctx;
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
index 8f15a12d..89ccdfe7 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
@@ -42,7 +42,7 @@ import at.gv.egiz.eaaf.core.impl.idp.conf.AbstractConfigurationImpl;
import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
@Service("BasicMSSpecificNodeConfig")
-@Profile("!springBoot")
+@Profile("deprecatedConfig")
public class BasicConfigurationProvider extends AbstractConfigurationImpl {
private static final Logger log = LoggerFactory.getLogger(BasicConfigurationProvider.class);