diff --git a/bauhaus-back-changeLog.txt b/bauhaus-back-changeLog.txt new file mode 100644 index 000000000..9192e11f2 --- /dev/null +++ b/bauhaus-back-changeLog.txt @@ -0,0 +1 @@ +2.1.0 : Ajout de la publication vers l'interne et changement d'ergonomie de l'application \ No newline at end of file diff --git a/src/main/java/fr/insee/rmes/config/ApplicationContext.java b/src/main/java/fr/insee/rmes/config/ApplicationContext.java index 3926f0f17..285554c5e 100644 --- a/src/main/java/fr/insee/rmes/config/ApplicationContext.java +++ b/src/main/java/fr/insee/rmes/config/ApplicationContext.java @@ -25,7 +25,7 @@ @Configuration("AppContext") @PropertySource(value = { "classpath:bauhaus-core.properties", "classpath:bauhaus-dev.properties", - "file:${catalina.base}/webapps/bauhaus-dev.properties", "file:${catalina.base}/webapps/bauhaus-qf.properties", + "file:${catalina.base}/webapps/bauhaus-dev.properties", "file:${catalina.base}/webapps/bauhaus-qf.properties","file:${catalina.base}/webapps/bauhaus-production.properties", "file:${catalina.base}/webapps/production.properties", }, ignoreResourceNotFound = true) public class ApplicationContext { diff --git a/src/main/java/fr/insee/rmes/config/Log4j2ServletContextListener.java b/src/main/java/fr/insee/rmes/config/Log4j2ServletContextListener.java index bc4b8a338..71e25c013 100644 --- a/src/main/java/fr/insee/rmes/config/Log4j2ServletContextListener.java +++ b/src/main/java/fr/insee/rmes/config/Log4j2ServletContextListener.java @@ -57,6 +57,7 @@ private Properties getProperties() throws IOException { props.load(getClass().getClassLoader().getResourceAsStream("bauhaus-dev.properties")); loadPropertiesIfExist(props, "bauhaus-dev.properties"); loadPropertiesIfExist(props, "bauhaus-qf.properties"); + loadPropertiesIfExist(props, "bauhaus-production.properties"); loadPropertiesIfExist(props, "production.properties"); return props; } diff --git a/src/main/java/fr/insee/rmes/config/auth/security/conditions/NoOpenIDConnectAuthCondition.java b/src/main/java/fr/insee/rmes/config/auth/security/conditions/NoOpenIDConnectAuthCondition.java index 2550e6462..556524a4a 100644 --- a/src/main/java/fr/insee/rmes/config/auth/security/conditions/NoOpenIDConnectAuthCondition.java +++ b/src/main/java/fr/insee/rmes/config/auth/security/conditions/NoOpenIDConnectAuthCondition.java @@ -35,6 +35,7 @@ private String getEnv() throws IOException { props.load(getClass().getClassLoader().getResourceAsStream("bauhaus-dev.properties")); loadPropertiesIfExist(props, "bauhaus-dev.properties"); loadPropertiesIfExist(props, "bauhaus-qf.properties"); + loadPropertiesIfExist(props, "bauhaus-production.properties"); loadPropertiesIfExist(props, "production.properties"); return props.getProperty("fr.insee.rmes.bauhaus.env"); } diff --git a/src/main/java/fr/insee/rmes/config/auth/security/conditions/OpenIDConnectAuthCondition.java b/src/main/java/fr/insee/rmes/config/auth/security/conditions/OpenIDConnectAuthCondition.java index 592ef877a..bf4f0a521 100644 --- a/src/main/java/fr/insee/rmes/config/auth/security/conditions/OpenIDConnectAuthCondition.java +++ b/src/main/java/fr/insee/rmes/config/auth/security/conditions/OpenIDConnectAuthCondition.java @@ -38,6 +38,7 @@ private String getEnv() throws IOException { .getResourceAsStream("bauhaus-dev.properties")); loadPropertiesIfExist(props, "bauhaus-dev.properties"); loadPropertiesIfExist(props, "bauhaus-qf.properties"); + loadPropertiesIfExist(props, "bauhaus-production.properties"); loadPropertiesIfExist(props, "production.properties"); return props.getProperty("fr.insee.rmes.bauhaus.env"); }