update app properties

georchestra · Nov 16, 2023 · 2df0e11 · 2df0e11
1 parent 62a18ff
commit 2df0e11
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/core/src/main/resources/config-spring-geonetwork.xml b/core/src/main/resources/config-spring-geonetwork.xml
@@ -38,10 +38,11 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties}"
+  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
+                                ignore-unresolvable="true"
+                                ignore-resource-not-found="true"
                                 order="3"
-                                file-encoding="UTF-8"
-                                ignore-unresolvable="true"/>
+                                file-encoding="UTF-8"/>
 
   <context:annotation-config/>
   <bean id="ProfileManager" class="jeeves.component.ProfileManager" lazy-init="true"/>

diff --git a/services/src/main/resources/config-spring-geonetwork.xml b/services/src/main/resources/config-spring-geonetwork.xml
@@ -34,10 +34,11 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties}"
+  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
+                                ignore-unresolvable="true"
+                                ignore-resource-not-found="true"
                                 order="3"
-                                file-encoding="UTF-8"
-                                ignore-unresolvable="true"/>
+                                file-encoding="UTF-8"/>
 
   <context:component-scan base-package="org.springdoc.webmvc"/>
   <context:component-scan base-package="org.springdoc.core"/>

diff --git a/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml b/web/src/main/webResources/WEB-INF/config-spring-geonetwork.xml
@@ -38,10 +38,11 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties}"
+  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
+                                ignore-unresolvable="true"
+                                ignore-resource-not-found="true"
                                 order="3"
-                                file-encoding="UTF-8"
-                                ignore-unresolvable="true"/>
+                                file-encoding="UTF-8"/>
 
   <import resource="config-spring-env.xml"/>
   <import resource="config-security/config-security.xml"/>

diff --git a/web/src/main/webResources/WEB-INF/spring-servlet.xml b/web/src/main/webResources/WEB-INF/spring-servlet.xml
@@ -42,8 +42,11 @@
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
   <context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
                                 ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>
-  <context:property-placeholder location="${app.properties}"
-                                file-encoding="UTF-8" ignore-unresolvable="true" order="3" />
+  <context:property-placeholder location="${app.properties},file://#{systemEnvironment['geonetwork_dir']}/config/app.properties"
+                                ignore-unresolvable="true"
+                                ignore-resource-not-found="true"
+                                order="3"
+                                file-encoding="UTF-8"/>
 
   <context:component-scan base-package="org.fao.geonet"/>