Skip to content
Snippets Groups Projects
Commit 3904bee2 authored by michaelisvy's avatar michaelisvy
Browse files

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

Allow to override data-access.properties with System Properties
parents c13f1412 8c5bbed6
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- Configurer that replaces ${...} placeholders with values from a properties file --> <!-- Configurer that replaces ${...} placeholders with values from a properties file -->
<!-- (in this case, JDBC-related settings for the JPA EntityManager definition below) --> <!-- (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 --> <!-- enables scanning for @Transactional annotations -->
<tx:annotation-driven /> <tx:annotation-driven />
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<!-- Configurer that replaces ${...} placeholders with values from a properties file --> <!-- Configurer that replaces ${...} placeholders with values from a properties file -->
<!-- (in this case, JDBC-related settings for the dataSource definition below) --> <!-- (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 <!-- DataSource configuration for the tomcat jdbc connection pool
See here for more details on commons-dbcp versus tomcat-jdbc: See here for more details on commons-dbcp versus tomcat-jdbc:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment