Change hibernate.properties to take configurable environment settings

build.gradle

@@ -1,3 +1,5 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
@@ -8,6 +10,7 @@
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply from: "./libraries.gradle"
+apply from: "./databases.gradle"
 
 
 buildscript {
@@ -136,6 +139,8 @@ subprojects { subProject ->
 		testRuntime( libraries.log4j )
 		testRuntime( libraries.javassist )
 		testRuntime( libraries.h2 )
+		testRuntime( libraries.hsqldb )
+		testRuntime( libraries.postgresql )
 		testRuntime( libraries.woodstox )
 
 		// 6.6 gave me some NPE problems from within checkstyle...
@@ -211,6 +216,12 @@ subprojects { subProject ->
 			}
 			into sourceSets.test.output.classesDir
 		}
+		copy {
+			ext.targetDir = file( "${buildDir}/resources/test" )
+			from file('src/test/resources')
+			into targetDir
+			filter( ReplaceTokens, tokens: dbBundle[db] );
+		}
 	} )
 
 	idea {

databases.gradle

@@ -0,0 +1,34 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+
+// build a map of the database settings to use.
+ext {
+        db = 'h2'
+        dbBundle = [
+                h2 : [
+                        'db.dialect' : 'org.hibernate.dialect.H2Dialect',
+                        'jdbc.driver': 'org.h2.Driver',
+                        'jdbc.user'  : 'sa',
+                        'jdbc.pass'  : '',
+                        'jdbc.url'   : 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000',
+                ],
+                hsqldb : [
+                        'db.dialect' : 'org.hibernate.dialect.HSQLDialect',
+                        'jdbc.driver': 'org.hsqldb.jdbc.JDBCDriver',
+                        'jdbc.user'  : 'sa',
+                        'jdbc.pass'  : '',
+                        'jdbc.url'   : 'jdbc:hsqldb:mem:test'
+                ],
+                pgsql : [
+                        'db.dialect' : 'org.hibernate.dialect.PostgreSQL94Dialect',
+                        'jdbc.driver': 'org.postgresql.Driver',
+                        'jdbc.user'  : 'hibernate_orm_test',
+                        'jdbc.pass'  : 'hibernate_orm_test',
+                        'jdbc.url'   : 'jdbc:postgresql:hibernate_orm_test'
+                ]
+        ]
+}

hibernate-c3p0/src/test/resources/hibernate.properties

@@ -4,10 +4,11 @@
 # License: GNU Lesser General Public License (LGPL), version 2.1 or later.
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 hibernate.c3p0.min_size 50

hibernate-core/src/test/resources/hibernate.properties

@@ -5,11 +5,11 @@
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
 
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-#hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 

hibernate-ehcache/src/test/resources/hibernate.properties

@@ -4,10 +4,11 @@
 # License: GNU Lesser General Public License (LGPL), version 2.1 or later.
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 

hibernate-entitymanager/hibernate-entitymanager.gradle

@@ -93,14 +93,9 @@ task copyBundleResources (type: Copy) {
 	ext.bundlesTargetDir = file( "${buildDir}/bundles" )
     from file('src/test/bundles') 
     into bundlesTargetDir
-    filter(ReplaceTokens, tokens: [
-            buildDirName: buildDir.absolutePath,
-            'db.dialect': 'org.hibernate.dialect.H2Dialect',
-            'jdbc.driver': 'org.h2.Driver',
-            'jdbc.user': 'sa',
-            'jdbc.pass': '',
-            'jdbc.url': 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1',
-    ]);
+    ext.bundleTokens = dbBundle[db]
+    ext.bundleTokens["buildDirName"] = buildDir.absolutePath
+    filter(ReplaceTokens, tokens: bundleTokens);
     doFirst {
         bundlesTargetDir.mkdirs()
     }
@@ -116,3 +111,4 @@ task testJar(type: Jar, dependsOn: testClasses) {
 artifacts {
     tests testJar
 }
+

hibernate-entitymanager/src/test/resources/hibernate.properties

@@ -5,20 +5,21 @@
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
 
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 
-hibernate.show_sql true
+hibernate.show_sql false
 hibernate.format_sql true
+
 hibernate.max_fetch_depth 5
 
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-hibernate.jdbc.batch_size 0
-
 hibernate.service.allow_crawling=false
+hibernate.session.events.log=true

hibernate-envers/src/test/resources/hibernate.properties

@@ -4,10 +4,11 @@
 # License: GNU Lesser General Public License (LGPL), version 2.1 or later.
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 

hibernate-hikaricp/src/test/resources/hibernate.properties

@@ -4,10 +4,11 @@
 # License: GNU Lesser General Public License (LGPL), version 2.1 or later.
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.jdbc.batch_size 10
 hibernate.connection.provider_class HikariCPConnectionProvider

hibernate-infinispan/src/test/resources/hibernate.properties

@@ -4,11 +4,11 @@
 # License: GNU Lesser General Public License (LGPL), version 2.1 or later.
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
-# hibernate.connection.password
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 

hibernate-java8/src/test/resources/hibernate.properties

@@ -5,10 +5,11 @@
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
 
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 

hibernate-proxool/src/test/resources/hibernate.properties

@@ -4,10 +4,11 @@
 # License: GNU Lesser General Public License (LGPL), version 2.1 or later.
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 hibernate.connection.pool_size 5
 hibernate.jdbc.batch_size 10

hibernate-spatial/src/test/resources/hibernate.properties

@@ -13,10 +13,11 @@ hibernate.show_sql true
 
 hibernate.max_fetch_depth 5
 
-hibernate.dialect org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class org.h2.Driver
-hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
-hibernate.connection.username sa
+hibernate.dialect @db.dialect@
+hibernate.connection.driver_class @jdbc.driver@
+hibernate.connection.url @jdbc.url@
+hibernate.connection.username @jdbc.user@
+hibernate.connection.password @jdbc.pass@
 
 #hibernate.cache.region_prefix hibernate.test
 #hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory

libraries.gradle

@@ -83,7 +83,9 @@ ext {
             shrinkwrap_api:  'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6',
             shrinkwrap:      'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6',
             h2:              "com.h2database:h2:${h2Version}",
+			hsqldb:          "org.hsqldb:hsqldb:2.3.2",
             derby:           "org.apache.derby:derby:10.11.1.1",
+			postgresql:      'org.postgresql:postgresql:9.4-1202-jdbc41',
             jboss_jta:       "org.jboss.jbossts:jbossjta:4.16.4.Final",
             xapool:          "com.experlog:xapool:1.5.0",
             mockito:         'org.mockito:mockito-core:1.9.0',