[hibernate-commits] Hibernate SVN: r19808 - in core/branches/gradle2/hibernate-ehcache: src and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-06-23 23:45:23 -0400 (Wed, 23 Jun 2010)
New Revision: 19808

Added:
   core/branches/gradle2/hibernate-ehcache/src/intgTest/
Removed:
   core/branches/gradle2/hibernate-ehcache/pom.xml
   core/branches/gradle2/hibernate-ehcache/src/test/
Modified:
   core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle
   core/branches/gradle2/hibernate-ehcache/src/intgTest/java/org/hibernate/cache/EhCacheTest.java
Log:
working ehcache module (see todo in .gradle)

Modified: core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle
===================================================================
--- core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle	2010-06-24 03:40:53 UTC (rev 19807)
+++ core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle	2010-06-24 03:45:23 UTC (rev 19808)
@@ -1,15 +1,10 @@
-dependencies {
-    ehcacheVersion = '1.5.0'
+apply plugin: 'java'
+apply plugin: org.hibernate.gradle.util.IntegrationTestPlugin
 
-    compile (
-            project(':hibernate-core'),
-            [group: 'net.sf.ehcache', name: 'ehcache', version: ehcacheVersion]
-    )
-    testCompile (
-            project(':hibernate-testing')
-    )
-    testRuntime (
-            [group: 'javassist', name: 'javassist', version: javassistVersion],
-            [group: 'cglib', name: 'cglib', version: cglibVersion]
-    )
+// todo : does this single test really need to be run against ever database in the matrix?
+
+dependencies {
+    compile( project( ':hibernate-core' ) )
+    compile( [group: 'net.sf.ehcache', name: 'ehcache', version: '1.5.0'] )
+    intgTestCompile( project(':hibernate-core').sourceSets.intgTest.classes )
 }
\ No newline at end of file

Deleted: core/branches/gradle2/hibernate-ehcache/pom.xml
===================================================================
--- core/branches/gradle2/hibernate-ehcache/pom.xml	2010-06-24 03:40:53 UTC (rev 19807)
+++ core/branches/gradle2/hibernate-ehcache/pom.xml	2010-06-24 03:45:23 UTC (rev 19808)
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    
-    <groupId>org.hibernate</groupId>
-    <artifactId>hibernate-ehcache</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Hibernate Ehcache Integration</name>
-    <description>Integration of Hibernate with Ehcache</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-testing</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.8.0.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

Copied: core/branches/gradle2/hibernate-ehcache/src/intgTest (from rev 19683, core/branches/gradle2/hibernate-ehcache/src/test)

Modified: core/branches/gradle2/hibernate-ehcache/src/intgTest/java/org/hibernate/cache/EhCacheTest.java
===================================================================
--- core/branches/gradle2/hibernate-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java	2010-06-02 21:38:28 UTC (rev 19683)
+++ core/branches/gradle2/hibernate-ehcache/src/intgTest/java/org/hibernate/cache/EhCacheTest.java	2010-06-24 03:45:23 UTC (rev 19808)
@@ -26,8 +26,8 @@
 import junit.framework.Test;
 
 import org.hibernate.cfg.Environment;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.test.cache.BaseCacheProviderTestCase;
+import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.testing.cache.BaseCacheProviderTestCase;
 
 /**
  * @author Emmanuel Bernard