[hibernate-commits] Hibernate SVN: r19824 - in core/branches/gradle2: hibernate-core and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-06-24 14:51:21 -0400 (Thu, 24 Jun 2010)
New Revision: 19824

Modified:
   core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle
   core/branches/gradle2/hibernate-core/hibernate-core.gradle
   core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle
   core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle
Log:
split processing of matrix databases and creating of matrix testing objects into separate plugins

Modified: core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle
===================================================================
--- core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle	2010-06-24 18:45:49 UTC (rev 19823)
+++ core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle	2010-06-24 18:51:21 UTC (rev 19824)
@@ -1,13 +1,17 @@
 apply plugin: 'java'
 apply plugin: org.hibernate.gradle.testing.matrix.MatrixTestingPlugin
 
+// not needed if we rename the directories to match the sourceSet name
 sourceSets {
-//    intgTest {
-//        resources{
-//            // resources inherently exclude sources
-//            srcDir 'src/intgTest/java'
-//        }
-//    }
+    matrix {
+        java {
+            setSrcDirs( ['src/intgTest/java'] )
+        }
+        // resources inherently exclude sources
+        resources {
+            setSrcDirs( ['src/intgTest/java','src/intgTest/resources'] )
+        }
+    }
 }
 
 dependencies {

Modified: core/branches/gradle2/hibernate-core/hibernate-core.gradle
===================================================================
--- core/branches/gradle2/hibernate-core/hibernate-core.gradle	2010-06-24 18:45:49 UTC (rev 19823)
+++ core/branches/gradle2/hibernate-core/hibernate-core.gradle	2010-06-24 18:51:21 UTC (rev 19824)
@@ -2,6 +2,7 @@
 apply plugin: 'antlr'
 apply plugin: org.hibernate.gradle.testing.matrix.MatrixTestingPlugin
 
+// not needed if we rename the directories to match the sourceSet name
 sourceSets {
     matrix {
         java {

Modified: core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle
===================================================================
--- core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle	2010-06-24 18:45:49 UTC (rev 19823)
+++ core/branches/gradle2/hibernate-ehcache/hibernate-ehcache.gradle	2010-06-24 18:51:21 UTC (rev 19824)
@@ -3,6 +3,19 @@
 
 // todo : does this single test really need to be run against ever database in the matrix?
 
+// not needed if we rename the directories to match the sourceSet name
+sourceSets {
+    matrix {
+        java {
+            setSrcDirs( ['src/intgTest/java'] )
+        }
+        // resources inherently exclude sources
+        resources {
+            setSrcDirs( ['src/intgTest/resources'] )
+        }
+    }
+}
+
 dependencies {
     compile( project( ':hibernate-core' ) )
     compile( [group: 'net.sf.ehcache', name: 'ehcache', version: '1.5.0'] )

Modified: core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle
===================================================================
--- core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle	2010-06-24 18:45:49 UTC (rev 19823)
+++ core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle	2010-06-24 18:51:21 UTC (rev 19824)
@@ -4,12 +4,20 @@
 // todo : there are test failures due to issues with how 'bundles' are handled.
 //      My guess is using TCCL as the tests try to is not valid in Gradle.
 
-//buildscript {
-//    dependencies {
-//        classpath libraries.jpa_modelgen
-//    }
-//}
 
+// not needed if we rename the directories to match the sourceSet name
+sourceSets {
+    matrix {
+        java {
+            setSrcDirs( ['src/intgTest/java'] )
+        }
+        // resources inherently exclude sources
+        resources {
+            setSrcDirs( ['src/intgTest/java','src/intgTest/resources'] )
+        }
+    }
+}
+
 dependencies {
     shrinkwrapVersion = '1.0.0-alpha-6'
 
@@ -39,9 +47,7 @@
     }
 }
 compileMatrixJava.dependsOn procTargetDir
-//sourceSets.intgTest.java.srcDir procTargetDirName
 
-
 bundlesTargetDirName = "$buildDirName/bundles"
 bundlesTargetDir = dir( bundlesTargetDirName )
 task processBundleResources {