From 4e91b4468e09a3ffe4e5d6ad6d3d18a9ca4aa1aa Mon Sep 17 00:00:00 2001 From: Mic Date: Wed, 13 Feb 2013 09:29:18 +0800 Subject: [PATCH] removed TopLink-specific and Hibernate-specific properties --- src/main/resources/spring/dao-config.xml | 4 ++-- src/main/resources/spring/jdbc.properties | 17 +---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/main/resources/spring/dao-config.xml b/src/main/resources/spring/dao-config.xml index 80ea4fbf8..d4a411057 100644 --- a/src/main/resources/spring/dao-config.xml +++ b/src/main/resources/spring/dao-config.xml @@ -44,12 +44,12 @@ p:dataSource-ref="dataSource"> + p:database="${jpa.database}" p:showSql="${jpa.showSql}" /> - + diff --git a/src/main/resources/spring/jdbc.properties b/src/main/resources/spring/jdbc.properties index a199c64c3..214778bdc 100644 --- a/src/main/resources/spring/jdbc.properties +++ b/src/main/resources/spring/jdbc.properties @@ -5,12 +5,6 @@ # Targeted at system administrators, to avoid touching the context XML files. -#------------------------------------------------------------------------------- -# Common Settings - -hibernate.generate_statistics=true -hibernate.show_sql=true -jpa.showSql=true #------------------------------------------------------------------------------- @@ -25,16 +19,10 @@ jdbc.password= jdbc.initLocation=classpath:db/hsqldb/initDB.sql jdbc.dataLocation=classpath:db/hsqldb/populateDB.sql -# Property that determines which Hibernate dialect to use -# (only applied with "applicationContext-hibernate.xml") -hibernate.dialect=org.hibernate.dialect.HSQLDialect - -# Property that determines which JPA DatabasePlatform to use with TopLink Essentials -jpa.databasePlatform=org.springframework.samples.petclinic.model.toplink.EssentialsHSQLPlatformWithNativeSequence - # Property that determines which database to use with an AbstractJpaVendorAdapter jpa.database=HSQL +jpa.showSql=true #------------------------------------------------------------------------------- # MySQL Settings @@ -52,8 +40,5 @@ jpa.database=HSQL # (only applied with "applicationContext-hibernate.xml") #hibernate.dialect=org.hibernate.dialect.MySQLDialect -# Property that determines which JPA DatabasePlatform to use with TopLink Essentials -#jpa.databasePlatform=oracle.toplink.essentials.platform.database.MySQL4Platform - # Property that determines which database to use with an AbstractJpaVendorAdapter #jpa.database=MYSQL