diff --git a/src/main/resources/spring/dao-config.xml b/src/main/resources/spring/dao-config.xml index 80ea4fbf86dbf2db0f0b08b7611e7a93f5e99dd3..d4a411057ac0054ce10a74ec86fa06420e3c2ae8 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"> <property name="jpaVendorAdapter"> <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" - p:database="${jpa.database}" p:showSql="${jpa.showSql}"/> + p:database="${jpa.database}" p:showSql="${jpa.showSql}" /> </property> <property name="persistenceUnitName" value="petclinic" /> <property name="packagesToScan" value="org/springframework/samples/petclinic" /> </bean> - + <!-- Transaction manager for a single JPA EntityManagerFactory (alternative to JTA) --> <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager" p:entityManagerFactory-ref="entityManagerFactory"/> diff --git a/src/main/resources/spring/jdbc.properties b/src/main/resources/spring/jdbc.properties index a199c64c397be7355d366ded133c3246754284c2..214778bdc63bd264be3c8ebd0f86c800d9bc9b3a 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