diff --git a/pom.xml b/pom.xml index 2ffe282a0..3e56f09b5 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,8 @@ 1.1.1 3.2.0.GA + + 5.1.36 2.3.0 @@ -189,7 +191,12 @@ - + + org.hibernate diff --git a/readme.md b/readme.md index a314398a2..8c84871da 100644 --- a/readme.md +++ b/readme.md @@ -15,6 +15,19 @@ You can then access petclinic here: http://localhost:9966/petclinic/ ## In case you find a bug/suggested improvement for Spring Petclinic Our issue tracker is available here: https://github.com/spring-projects/spring-petclinic/issues + +## Database configuration + +In its default configuration, Petclinic uses an in-memory database (HSQLDB) which +gets populated at startup with data. A similar setup is provided for MySql in case a persistent database configuration is needed. +Note that whenever the database type is changed, the data-access.properties file needs to be updated and the mysql-connector-java artifact from the pom.xml needs to be uncommented. + +You may start a MySql database with docker: + +``` +docker run -e MYSQL_ROOT_PASSWORD=petclinic -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:5.7.8 +``` + ## Working with Petclinic in Eclipse/STS ### prerequisites diff --git a/src/main/resources/db_readme.txt b/src/main/resources/db_readme.txt deleted file mode 100644 index 68e3f245c..000000000 --- a/src/main/resources/db_readme.txt +++ /dev/null @@ -1,13 +0,0 @@ -================================================================================ -=== Spring PetClinic sample application - Database Configuration === -================================================================================ - -@author Costin Leau - --------------------------------------------------------------------------------- - -In its default configuration, Petclinic uses an in-memory database (HSQLDB) which -gets populated at startup with data. A similar setup is provided for Mysql in case -a persistent database configuration is needed. -Note that whenever the database type is changed, the data-access.properties file needs to -be updated. diff --git a/src/main/resources/spring/data-access.properties b/src/main/resources/spring/data-access.properties index c1cc3cefd..e154d81db 100644 --- a/src/main/resources/spring/data-access.properties +++ b/src/main/resources/spring/data-access.properties @@ -4,6 +4,12 @@ # various application context XML files (e.g., "applicationContext-*.xml"). # Targeted at system administrators, to avoid touching the context XML files. +# Properties that control the population of schema and data for a new data source +jdbc.initLocation=classpath:db/hsqldb/initDB.sql +jdbc.dataLocation=classpath:db/hsqldb/populateDB.sql + +jpa.showSql=true + #------------------------------------------------------------------------------- # HSQL Settings @@ -12,14 +18,9 @@ jdbc.url=jdbc:hsqldb:mem:petclinic jdbc.username=sa jdbc.password= -# Properties that control the population of schema and data for a new data source -jdbc.initLocation=classpath:db/hsqldb/initDB.sql -jdbc.dataLocation=classpath:db/hsqldb/populateDB.sql - # Property that determines which database to use with an AbstractJpaVendorAdapter jpa.database=HSQL -jpa.showSql=true #------------------------------------------------------------------------------- # MySQL Settings @@ -27,15 +28,7 @@ jpa.showSql=true #jdbc.driverClassName=com.mysql.jdbc.Driver #jdbc.url=jdbc:mysql://localhost:3306/petclinic #jdbc.username=root -#jdbc.password= - -# Properties that control the population of schema and data for a new data source -#jdbc.initLocation=classpath:db/mysql/initDB.sql -#jdbc.dataLocation=classpath:db/mysql/populateDB.sql - -# Property that determines which Hibernate dialect to use -# (only applied with "applicationContext-hibernate.xml") -#hibernate.dialect=org.hibernate.dialect.MySQLDialect +#jdbc.password=petclinic # Property that determines which database to use with an AbstractJpaVendorAdapter #jpa.database=MYSQL