From 9b501805c6f5ca874df900562bbdca526bb09ffb Mon Sep 17 00:00:00 2001 From: Strong Liu Date: Wed, 23 May 2012 21:31:35 +0800 Subject: [PATCH] HHH-7345 add derby to the matrix testing suite --- .gitignore | 1 + databases/derby/matrix.gradle | 25 ++++++++ .../derby/resources/hibernate.properties | 40 ++++++++++++ .../src/test/resources/hibernate.properties | 61 +++++++------------ 4 files changed, 88 insertions(+), 39 deletions(-) create mode 100644 databases/derby/matrix.gradle create mode 100644 databases/derby/resources/hibernate.properties diff --git a/.gitignore b/.gitignore index a54324ff7a..adced34f0d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ */target /build */build +testdb # IntelliJ specific files/directories out diff --git a/databases/derby/matrix.gradle b/databases/derby/matrix.gradle new file mode 100644 index 0000000000..39b1873402 --- /dev/null +++ b/databases/derby/matrix.gradle @@ -0,0 +1,25 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + +jdbcDependency "org.apache.derby:derby:10.8.2.2" \ No newline at end of file diff --git a/databases/derby/resources/hibernate.properties b/databases/derby/resources/hibernate.properties new file mode 100644 index 0000000000..599da05bdc --- /dev/null +++ b/databases/derby/resources/hibernate.properties @@ -0,0 +1,40 @@ +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# Copyright (c) 2011, Red Hat Inc. or third-party contributors as +# indicated by the @author tags or express copyright attribution +# statements applied by the authors. All third-party contributions are +# distributed under license by Red Hat Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# Lesser General Public License, as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License +# for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this distribution; if not, write to: +# Free Software Foundation, Inc. +# 51 Franklin Street, Fifth Floor +# Boston, MA 02110-1301 USA +# + +hibernate.dialect org.hibernate.dialect.DerbyTenSevenDialect +hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver +hibernate.connection.url jdbc:derby:testdb;create=true +hibernate.connection.username sa + +hibernate.connection.pool_size 5 + +hibernate.show_sql true +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 + + diff --git a/hibernate-core/src/test/resources/hibernate.properties b/hibernate-core/src/test/resources/hibernate.properties index 2c4ccee114..ed58179c7e 100644 --- a/hibernate-core/src/test/resources/hibernate.properties +++ b/hibernate-core/src/test/resources/hibernate.properties @@ -1,39 +1,22 @@ -# -# Hibernate, Relational Persistence for Idiomatic Java -# -# Copyright (c) 2010, Red Hat Inc. or third-party contributors as -# indicated by the @author tags or express copyright attribution -# statements applied by the authors. All third-party contributions are -# distributed under license by Red Hat Inc. -# -# This copyrighted material is made available to anyone wishing to use, modify, -# copy, or redistribute it subject to the terms and conditions of the GNU -# Lesser General Public License, as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License -# for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this distribution; if not, write to: -# Free Software Foundation, Inc. -# 51 Franklin Street, Fifth Floor -# Boston, MA 02110-1301 USA -# -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.connection.pool_size 5 - -hibernate.show_sql false - -hibernate.max_fetch_depth 5 - -hibernate.cache.region_prefix hibernate.test -hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory - -# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle -hibernate.jdbc.batch_versioned_data true +#Generated by DBAllocator +#Wed May 23 08:58:04 EDT 2012 +db.password=dballo04 +hibernate.connection.password=dballo04 +db.username=dballo04 +dballoc.db_type=standard +db.jdbc_url=jdbc\:postgresql\://db02.mw.lab.eng.bos.redhat.com\:5432/dballo04 +db.name=dballo04 +db.hostname=db02.mw.lab.eng.bos.redhat.com +hibernate.connection.username=dballo04 +db.jdbc_class=org.postgresql.Driver +db.maxpoolsize=50 +db.minpoolsize=15 +hibernate.connection.driver_class=org.postgresql.Driver +uuid=350f2e3a-df00-4b56-91ca-fdd8b5316f1e +db.primary_label=postgresql91 +db.port=5432 +hibernate.dialect=org.hibernate.dialect.PostgreSQL82Dialect +hibernate.connection.url=jdbc\:postgresql\://db02.mw.lab.eng.bos.redhat.com\:5432/dballo04 +hibernate.connection.schema=dballo04 +hibernate.show_sql=true +hibernate.format_sql=true \ No newline at end of file