Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-15 12:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #22 from cyrille-leclerc/system-property-placeholders

Browse source 
Allow to override data-access.properties with System Properties
This commit is contained in:
michaelisvy 2013-06-30 20:15:59 -07:00
commit 3904bee262
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/resources/spring/business-config.xml
View file

@ -20,7 +20,7 @@
<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
<!-- (in this case, JDBC-related settings for the JPA EntityManager definition below) -->
<context:property-placeholder location="classpath:spring/data-access.properties"/>
<context:property-placeholder location="classpath:spring/data-access.properties" system-properties-mode="OVERRIDE"/>
<!-- enables scanning for @Transactional annotations -->
<tx:annotation-driven />

2
src/main/resources/spring/datasource-config.xml
View file

@ -17,7 +17,7 @@
<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
<context:property-placeholder location="classpath:spring/data-access.properties"/>
<context:property-placeholder location="classpath:spring/data-access.properties" system-properties-mode="OVERRIDE"/>
<!-- DataSource configuration for the tomcat jdbc connection pool
See here for more details on commons-dbcp versus tomcat-jdbc: