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
93a378ad
Commit
93a378ad
authored
15 years ago
by
Costin Leau
Committed by
Mic
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
SPR-6447
+ fixed tab/spaces consistency
parent
6f056b50
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/webapp/WEB-INF/applicationContext-dataSource.xml
+8
-8
8 additions, 8 deletions
src/main/webapp/WEB-INF/applicationContext-dataSource.xml
src/main/webapp/WEB-INF/applicationContext-jpa.xml
+4
-4
4 additions, 4 deletions
src/main/webapp/WEB-INF/applicationContext-jpa.xml
with
12 additions
and
12 deletions
src/main/webapp/WEB-INF/applicationContext-dataSource.xml
+
8
−
8
View file @
93a378ad
...
@@ -11,13 +11,13 @@
...
@@ -11,13 +11,13 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd"
>
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd"
>
<!-- ========================= DATASOURCE DEFINITION ========================= -->
<!-- ========================= DATASOURCE DEFINITION ========================= -->
<!-- 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:jdbc.properties"
/>
<context:property-placeholder
location=
"classpath:jdbc.properties"
/>
<!-- DataSource configuration for Apache Commons DBCP. -->
<!-- DataSource configuration for Apache Commons DBCP. -->
<bean
id=
"dataSource"
class=
"org.apache.commons.dbcp.BasicDataSource"
destroy-method=
"close"
<bean
id=
"dataSource"
class=
"org.apache.commons.dbcp.BasicDataSource"
destroy-method=
"close"
p:driverClassName=
"${jdbc.driverClassName}"
p:url=
"${jdbc.url}"
p:driverClassName=
"${jdbc.driverClassName}"
p:url=
"${jdbc.url}"
p:username=
"${jdbc.username}"
p:password=
"${jdbc.password}"
/>
p:username=
"${jdbc.username}"
p:password=
"${jdbc.password}"
/>
...
@@ -29,9 +29,9 @@
...
@@ -29,9 +29,9 @@
<!-- Database initializer. If any of the script fails, the initialization stops. -->
<!-- Database initializer. If any of the script fails, the initialization stops. -->
<!-- As an alternative, for embedded databases see <jdbc:embedded-database/>. -->
<!-- As an alternative, for embedded databases see <jdbc:embedded-database/>. -->
<jdbc:initialize-database
data-source=
"dataSource"
>
<jdbc:initialize-database
data-source=
"dataSource"
>
<jdbc:script
location=
"${jdbc.initLocation}"
/>
<jdbc:script
location=
"${jdbc.initLocation}"
/>
<jdbc:script
location=
"${jdbc.dataLocation}"
/>
<jdbc:script
location=
"${jdbc.dataLocation}"
/>
</jdbc:initialize-database>
</jdbc:initialize-database>
</beans>
</beans>
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/applicationContext-jpa.xml
+
4
−
4
View file @
93a378ad
...
@@ -13,9 +13,9 @@
...
@@ -13,9 +13,9 @@
<!-- ========================= RESOURCE DEFINITIONS ========================= -->
<!-- ========================= RESOURCE DEFINITIONS ========================= -->
<!-- import the dataSource definition -->
<!-- import the dataSource definition -->
<import
resource=
"applicationContext-dataSource.xml"
/>
<import
resource=
"applicationContext-dataSource.xml"
/>
<!--
<!--
Activates a load-time weaver for the context. Any bean within the context that
Activates a load-time weaver for the context. Any bean within the context that
implements LoadTimeWeaverAware (such as LocalContainerEntityManagerFactoryBean)
implements LoadTimeWeaverAware (such as LocalContainerEntityManagerFactoryBean)
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<!-- (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:jdbc.properties"
/>
<context:property-placeholder
location=
"classpath:jdbc.properties"
/>
<!-- JPA EntityManagerFactory -->
<!-- JPA EntityManagerFactory -->
<bean
id=
"entityManagerFactory"
class=
"org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
<bean
id=
"entityManagerFactory"
class=
"org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
p:dataSource-ref=
"dataSource"
>
p:dataSource-ref=
"dataSource"
>
<property
name=
"jpaVendorAdapter"
>
<property
name=
"jpaVendorAdapter"
>
...
...
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