From 2443fede6596eb0ff9de6730d84555dd1dc41819 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Mon, 11 Oct 2010 17:43:42 -0500 Subject: [PATCH] HHH-5616 - Switch to Gradle for builds .. incorrect .gitignore --- .gitignore | 2 - build.gradle | 20 +++++----- .../src/test/resources/hibernate.properties | 36 +++++++++++++++++ .../src/test/resources/log4j.properties | 16 ++++++++ .../src/test/resources/hibernate.properties | 31 +++++++++++++++ .../src/test/resources/log4j.properties | 32 +++++++++++++++ .../overridenpar/overridenpar.properties | 5 +++ .../src/test/resources/hibernate.properties | 38 ++++++++++++++++++ .../src/test/resources/log4j.properties | 39 +++++++++++++++++++ .../src/test/resources/log4j.properties | 32 +++++++++++++++ .../src/test/resources/hibernate.properties | 36 +++++++++++++++++ .../src/test/resources/log4j.properties | 37 ++++++++++++++++++ wrapper/gradle-wrapper.properties | 9 +++++ 13 files changed, 321 insertions(+), 12 deletions(-) create mode 100644 hibernate-core/src/test/resources/hibernate.properties create mode 100644 hibernate-core/src/test/resources/log4j.properties create mode 100644 hibernate-ehcache/src/test/resources/hibernate.properties create mode 100644 hibernate-ehcache/src/test/resources/log4j.properties create mode 100644 hibernate-entitymanager/src/test/bundles/overridenpar/overridenpar.properties create mode 100644 hibernate-entitymanager/src/test/resources/hibernate.properties create mode 100755 hibernate-entitymanager/src/test/resources/log4j.properties create mode 100644 hibernate-envers/src/test/resources/log4j.properties create mode 100755 hibernate-infinispan/src/test/resources/hibernate.properties create mode 100755 hibernate-infinispan/src/test/resources/log4j.properties create mode 100644 wrapper/gradle-wrapper.properties diff --git a/.gitignore b/.gitignore index f96b990167..1db6207f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .gradle target build -local .idea .idea/* *.ipr @@ -13,5 +12,4 @@ atlassian-ide-plugin.xml .settings .nbattrs *.log -*.properties .clover diff --git a/build.gradle b/build.gradle index 9246d510f8..1e8608834d 100644 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ subprojects { subProject -> if ( ! subProject.name.startsWith( 'hibernate-release' ) ) { apply plugin: 'java' apply plugin: 'maven' // for install task as well as deploy dependencies -// apply plugin: org.hibernate.build.gradle.upload.UploadManager + apply plugin: org.hibernate.build.gradle.upload.UploadManager configurations { provided { @@ -205,15 +205,15 @@ subprojects { subProject -> name = 'jbossDeployer' configuration = configurations.deployerJars pom.project pomConfig -// repository(url: "https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/") -// snapshotRepository(url: "https://repository.jboss.org/nexus/content/repositories/snapshots") - credentials = [userName: JBOSS_NEXUS_USERNAME, password: JBOSS_NEXUS_PASSWORD] - repository(url: "https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/") { - authentication(credentials) - } - snapshotRepository(url: "https://repository.jboss.org/nexus/content/repositories/snapshots") { - authentication(credentials) - } + repository(url: "https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/") + snapshotRepository(url: "https://repository.jboss.org/nexus/content/repositories/snapshots") +// credentials = [userName: JBOSS_NEXUS_USERNAME, password: JBOSS_NEXUS_PASSWORD] +// repository(url: "https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/") { +// authentication(credentials) +// } +// snapshotRepository(url: "https://repository.jboss.org/nexus/content/repositories/snapshots") { +// authentication(credentials) +// } } } diff --git a/hibernate-core/src/test/resources/hibernate.properties b/hibernate-core/src/test/resources/hibernate.properties new file mode 100644 index 0000000000..23a0730c6f --- /dev/null +++ b/hibernate-core/src/test/resources/hibernate.properties @@ -0,0 +1,36 @@ +# +# 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 true + +hibernate.max_fetch_depth 5 + +hibernate.cache.region_prefix hibernate.test +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider diff --git a/hibernate-core/src/test/resources/log4j.properties b/hibernate-core/src/test/resources/log4j.properties new file mode 100644 index 0000000000..727d1d9c1a --- /dev/null +++ b/hibernate-core/src/test/resources/log4j.properties @@ -0,0 +1,16 @@ +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + + +log4j.rootLogger=info, stdout + +log4j.logger.org.hibernate.test=info +log4j.logger.org.hibernate.tool.hbm2ddl=debug +log4j.logger.org.hibernate.hql.ast.QueryTranslatorImpl=trace +log4j.logger.org.hibernate.hql.ast.HqlSqlWalker=trace +log4j.logger.org.hibernate.hql.ast.SqlGenerator=trace +log4j.logger.org.hibernate.hql.ast.AST=trace +log4j.logger.org.hibernate.type.descriptor.sql.BasicBinder=trace +log4j.logger.org.hibernate.type.BasicTypeRegistry=trace \ No newline at end of file diff --git a/hibernate-ehcache/src/test/resources/hibernate.properties b/hibernate-ehcache/src/test/resources/hibernate.properties new file mode 100644 index 0000000000..079509a869 --- /dev/null +++ b/hibernate-ehcache/src/test/resources/hibernate.properties @@ -0,0 +1,31 @@ +# +# 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.cache.region_prefix hibernate.test diff --git a/hibernate-ehcache/src/test/resources/log4j.properties b/hibernate-ehcache/src/test/resources/log4j.properties new file mode 100644 index 0000000000..d63d595b0f --- /dev/null +++ b/hibernate-ehcache/src/test/resources/log4j.properties @@ -0,0 +1,32 @@ +################################################################################ +# Hibernate, Relational Persistence for Idiomatic Java # +# # +# Copyright (c) 2007, Red Hat Middleware LLC 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 Middleware LLC. # +# # +# 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 # +################################################################################ +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + + +log4j.rootLogger=info, stdout + +log4j.logger.org.hibernate.test=info \ No newline at end of file diff --git a/hibernate-entitymanager/src/test/bundles/overridenpar/overridenpar.properties b/hibernate-entitymanager/src/test/bundles/overridenpar/overridenpar.properties new file mode 100644 index 0000000000..d05eed05b0 --- /dev/null +++ b/hibernate-entitymanager/src/test/bundles/overridenpar/overridenpar.properties @@ -0,0 +1,5 @@ +hibernate.connection.driver_class ${jdbc.driver} +hibernate.connection.url ${jdbc.url} +hibernate.connection.username ${jdbc.user} +hibernate.connection.password ${jdbc.pass} +hibernate.connection.isolation ${jdbc.isolation} \ No newline at end of file diff --git a/hibernate-entitymanager/src/test/resources/hibernate.properties b/hibernate-entitymanager/src/test/resources/hibernate.properties new file mode 100644 index 0000000000..c8f50d5271 --- /dev/null +++ b/hibernate-entitymanager/src/test/resources/hibernate.properties @@ -0,0 +1,38 @@ +# +# 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 true + +hibernate.max_fetch_depth 5 + +hibernate.cache.region_prefix hibernate.test +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider + +hibernate.jdbc.batch_size 0 diff --git a/hibernate-entitymanager/src/test/resources/log4j.properties b/hibernate-entitymanager/src/test/resources/log4j.properties new file mode 100755 index 0000000000..29d8ee3281 --- /dev/null +++ b/hibernate-entitymanager/src/test/resources/log4j.properties @@ -0,0 +1,39 @@ +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +log4j.rootLogger=warn, stdout + +log4j.logger.org.hibernate=debug +#log4j.logger.org.hibernate=debug + +log4j.logger.org.hibernate.ejb=debug +log4j.logger.org.hibernate.ejb.packaging=debug +log4j.logger.org.hibernate.reflection=debug + +#log4j.logger.org.hibernate.engine.Cascades=debug +#log4j.logger.org.hibernate.hql=debug + +### log just the SQL +log4j.logger.org.hibernate.SQL=debug + +### log JDBC bind parameters ### +#log4j.logger.org.hibernate.type=info +log4j.logger.org.hibernate.type=trace + +### log schema export/update ### +log4j.logger.org.hibernate.tool.hbm2ddl=debug + +### log HQL parse trees +#log4j.logger.org.hibernate.hql=debug + +### log cache activity ### +#log4j.logger.org.hibernate.cache=debug + +### log JDBC resource acquisition +#log4j.logger.org.hibernate.jdbc=debug + +### enable the following line if you want to track down connection ### +### leakages when using DriverManagerConnectionProvider ### +#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace diff --git a/hibernate-envers/src/test/resources/log4j.properties b/hibernate-envers/src/test/resources/log4j.properties new file mode 100644 index 0000000000..a144df5fc3 --- /dev/null +++ b/hibernate-envers/src/test/resources/log4j.properties @@ -0,0 +1,32 @@ +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# Copyright (c) 2008, Red Hat Middleware LLC 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 Middleware LLC. +# +# 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 +# +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +log4j.rootLogger=info, stdout + +log4j.logger.org.hibernate.test=info +log4j.logger.org.hibernate.tool.hbm2ddl=debug \ No newline at end of file diff --git a/hibernate-infinispan/src/test/resources/hibernate.properties b/hibernate-infinispan/src/test/resources/hibernate.properties new file mode 100755 index 0000000000..f3509e0000 --- /dev/null +++ b/hibernate-infinispan/src/test/resources/hibernate.properties @@ -0,0 +1,36 @@ +################################################################################ +# Hibernate, Relational Persistence for Idiomatic Java # +# # +# Copyright (c) 2007, Red Hat, Inc. and/or it's affiliates 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. and/or it's affiliates. # +# # +# 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.HSQLDialect +hibernate.connection.driver_class org.hsqldb.jdbcDriver +hibernate.connection.url jdbc:hsqldb:mem:/test +hibernate.connection.username sa +hibernate.connection.password + +hibernate.connection.pool_size 5 + +hibernate.format_sql true + +hibernate.max_fetch_depth 5 + +hibernate.generate_statistics true diff --git a/hibernate-infinispan/src/test/resources/log4j.properties b/hibernate-infinispan/src/test/resources/log4j.properties new file mode 100755 index 0000000000..e0d43385e0 --- /dev/null +++ b/hibernate-infinispan/src/test/resources/log4j.properties @@ -0,0 +1,37 @@ +################################################################################ +# Hibernate, Relational Persistence for Idiomatic Java # +# # +# Copyright (c) 2007, Red Hat, Inc. and/or it's affiliates 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. and/or it's affiliates. # +# # +# 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 # +################################################################################ +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p [%t] %c{1}:%L - %m%n + + +log4j.rootLogger=info, stdout + +#log4j.logger.org.hibernate.test=info +log4j.logger.org.hibernate.test=info +log4j.logger.org.hibernate.cache=info +log4j.logger.org.hibernate.SQL=info +#log4j.logger.org.jgroups=info +#log4j.logger.org.infinispan=trace \ No newline at end of file diff --git a/wrapper/gradle-wrapper.properties b/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..89accf45eb --- /dev/null +++ b/wrapper/gradle-wrapper.properties @@ -0,0 +1,9 @@ +#Mon Oct 11 07:41:33 CDT 2010 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +distributionVersion=0.9-rc-1 +zipStorePath=wrapper/dists +urlRoot=http\://dist.codehaus.org/gradle +distributionName=gradle +distributionClassifier=bin