From 429d0fd8f941b37d2bd5f38b57089af3f05c92c0 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Sat, 9 Oct 2010 13:44:08 -0500 Subject: [PATCH] HHH-5616 - Switch to Gradle for builds .. ehcache --- build.gradle | 1 + cache-ehcache/pom.xml | 54 ------------------- .../src/test/resources/hibernate.properties | 32 ----------- .../src/test/resources/log4j.properties | 32 ----------- hibernate-ehcache/hibernate-ehcache.gradle | 7 +++ .../java/org/hibernate/cache/EhCache.java | 0 .../org/hibernate/cache/EhCacheProvider.java | 0 .../cache/SingletonEhCacheProvider.java | 0 .../java/org/hibernate/cache/EhCacheTest.java | 0 .../src/test/resources/ehcache.xml | 0 settings.gradle | 2 + 11 files changed, 10 insertions(+), 118 deletions(-) delete mode 100644 cache-ehcache/pom.xml delete mode 100644 cache-ehcache/src/test/resources/hibernate.properties delete mode 100644 cache-ehcache/src/test/resources/log4j.properties create mode 100644 hibernate-ehcache/hibernate-ehcache.gradle rename {cache-ehcache => hibernate-ehcache}/src/main/java/org/hibernate/cache/EhCache.java (100%) rename {cache-ehcache => hibernate-ehcache}/src/main/java/org/hibernate/cache/EhCacheProvider.java (100%) rename {cache-ehcache => hibernate-ehcache}/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java (100%) rename {cache-ehcache => hibernate-ehcache}/src/test/java/org/hibernate/cache/EhCacheTest.java (100%) rename {cache-ehcache => hibernate-ehcache}/src/test/resources/ehcache.xml (100%) diff --git a/build.gradle b/build.gradle index 11db9864cd..a927cbcc13 100644 --- a/build.gradle +++ b/build.gradle @@ -100,6 +100,7 @@ subprojects { subProject -> testRuntime( libraries.jcl_slf4j ) testRuntime( libraries.jcl_api ) testRuntime( libraries.jcl ) + testRuntime( libraries.javassist ) testRuntime( libraries.h2 ) } diff --git a/cache-ehcache/pom.xml b/cache-ehcache/pom.xml deleted file mode 100644 index 52cca813b6..0000000000 --- a/cache-ehcache/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - 4.0.0 - - - org.hibernate - hibernate-parent - 3.6.0-SNAPSHOT - ../parent/pom.xml - - - org.hibernate - hibernate-ehcache - jar - - Hibernate Ehcache Integration - Integration of Hibernate with Ehcache - - - - ${groupId} - hibernate-core - ${version} - - - net.sf.ehcache - ehcache - 1.5.0 - - - ${groupId} - hibernate-testing - ${version} - test - - - hsqldb - hsqldb - 1.8.0.2 - test - - - cglib - cglib - test - - - javassist - javassist - test - - - diff --git a/cache-ehcache/src/test/resources/hibernate.properties b/cache-ehcache/src/test/resources/hibernate.properties deleted file mode 100644 index f0db52e020..0000000000 --- a/cache-ehcache/src/test/resources/hibernate.properties +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# 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 # -################################################################################ -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.cache.region_prefix hibernate.test diff --git a/cache-ehcache/src/test/resources/log4j.properties b/cache-ehcache/src/test/resources/log4j.properties deleted file mode 100644 index d63d595b0f..0000000000 --- a/cache-ehcache/src/test/resources/log4j.properties +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# 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-ehcache/hibernate-ehcache.gradle b/hibernate-ehcache/hibernate-ehcache.gradle new file mode 100644 index 0000000000..fc6165c231 --- /dev/null +++ b/hibernate-ehcache/hibernate-ehcache.gradle @@ -0,0 +1,7 @@ +apply plugin: 'java' + +dependencies { + compile( project( ':hibernate-core' ) ) + compile( [group: 'net.sf.ehcache', name: 'ehcache', version: '1.5.0'] ) + testCompile( project(':hibernate-core').sourceSets.test.classes ) +} \ No newline at end of file diff --git a/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/EhCache.java similarity index 100% rename from cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java rename to hibernate-ehcache/src/main/java/org/hibernate/cache/EhCache.java diff --git a/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java similarity index 100% rename from cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java rename to hibernate-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java diff --git a/cache-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java similarity index 100% rename from cache-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java rename to hibernate-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java diff --git a/cache-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java b/hibernate-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java similarity index 100% rename from cache-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java rename to hibernate-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java diff --git a/cache-ehcache/src/test/resources/ehcache.xml b/hibernate-ehcache/src/test/resources/ehcache.xml similarity index 100% rename from cache-ehcache/src/test/resources/ehcache.xml rename to hibernate-ehcache/src/test/resources/ehcache.xml diff --git a/settings.gradle b/settings.gradle index 85fcce91ca..5af3533e80 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,8 @@ include 'hibernate-envers' include 'hibernate-c3p0' include 'hibernate-proxool' +include 'hibernate-ehcache' + rootProject.children.each { project -> project.buildFileName = "${project.name}.gradle"