Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
broken-petclinic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Smart
broken-petclinic
Commits
8c5bbed6
Commit
8c5bbed6
authored
11 years ago
by
Cyrille Le Clerc
Browse files
Options
Downloads
Patches
Plain Diff
Allow to override data-access.properties with System Properties
parent
c13f1412
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/spring/business-config.xml
+1
-1
1 addition, 1 deletion
src/main/resources/spring/business-config.xml
src/main/resources/spring/datasource-config.xml
+1
-1
1 addition, 1 deletion
src/main/resources/spring/datasource-config.xml
with
2 additions
and
2 deletions
src/main/resources/spring/business-config.xml
+
1
−
1
View file @
8c5bbed6
...
@@ -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
/>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/spring/datasource-config.xml
+
1
−
1
View file @
8c5bbed6
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment