Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 978f4bb

Browse filesBrowse files
offtherailzofftherailz
authored
geosolutions-it#7526 Attempt fix to issue with properties paceholder configurer order (geosolutions-it#7532)
1 parent 9a6d775 commit 978f4bb
Copy full SHA for 978f4bb

2 files changed

+28-2Lines changed: 28 additions & 2 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎java/web/src/main/resources/applicationContext.xml‎

Copy file name to clipboardExpand all lines: java/web/src/main/resources/applicationContext.xml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</bean>
3131

3232
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
33-
<property name="order" value="10"/>
33+
<property name="order" value="0"/>
3434
<property name="locations">
3535
<list>
3636
<value>classpath:geostore.properties</value>
@@ -42,7 +42,7 @@
4242
</list>
4343
</property>
4444
<property name="ignoreResourceNotFound" value="true"/>
45-
</bean>
45+
</bean>
4646
<!-- Allows getting database configuration also from the data-dir -->
4747
<bean class="org.springframework.beans.factory.config.PropertyOverrideConfigurer">
4848
<property name="ignoreResourceNotFound" value="true"/>
Collapse file

‎project/standard/templates/web/src/main/resources/applicationContext.xml‎

Copy file name to clipboardExpand all lines: project/standard/templates/web/src/main/resources/applicationContext.xml
+26Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,30 @@
2828
<!-- The default password encoder -->
2929
<property name="passwordEncoder" ref="${passwordEncoderUsed}"></property>
3030
</bean>
31+
32+
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
33+
<property name="order" value="0"/>
34+
<property name="locations">
35+
<list>
36+
<value>classpath:geostore.properties</value>
37+
<value>classpath*:geostore.properties</value>
38+
<value>classpath:mapstore.properties</value>
39+
<value>classpath:ldap.properties</value>
40+
<value>file:${datadir.location:}/mapstore.properties</value>
41+
<value>file:${datadir.location:}/ldap.properties</value>
42+
</list>
43+
</property>
44+
<property name="ignoreResourceNotFound" value="true"/>
45+
</bean>
46+
<!-- Allows getting database configuration also from the data-dir -->
47+
<bean class="org.springframework.beans.factory.config.PropertyOverrideConfigurer">
48+
<property name="ignoreResourceNotFound" value="true"/>
49+
<property name="order" value="10"/>
50+
<property name="locations">
51+
<list>
52+
<value>file:${datadir.location:}/geostore-datasource-ovr.properties</value>
53+
<value>file:${datadir.location:}/mapstore-ovr.properties</value>
54+
</list>
55+
</property>
56+
</bean>
3157
</beans>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.