Update to match new release's rules

InseeFr · Aug 10, 2020 · 31832bd · 31832bd
1 parent bc22790
commit 31832bd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/bauhaus-back-changeLog.txt 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
diff --git 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
@@ -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/...main/java/fr/insee/rmes/config/auth/security/conditions/NoOpenIDConnectAuthCondition.java b/...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
@@ -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");
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		2.1.0 : Ajout de la publication vers l'interne et changement d'ergonomie de l'application