Author: steve.ebersole(a)jboss.com Date: 2010-06-30 09:39:58 -0400 (Wed, 30 Jun 2010) New Revision: 19864 Modified: core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java Log: local changes to get infinispan tests compiling Modified: core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle =================================================================== --- core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle 2010-06-30 13:39:50 UTC (rev 19863) +++ core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle 2010-06-30 13:39:58 UTC (rev 19864) @@ -35,6 +35,10 @@ sourceCompatibility = "1.6" targetCompatibility = "1.6" +ideaModule { + javaVersion = "1.6" +} + compileJava { options.fork( executable: java6Home.getJavacExecutable() ) } @@ -47,10 +51,6 @@ executable = java6Home.getJavaExecutable() } -ideaModule { - javaVersion = "1.6" -} - // todo : need to account for skipUnitTests from pom.xml // todo : need to account for groups.bind_addr from pom.xml // todo : need to account for surefire system-properties from pom.xml Modified: core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java =================================================================== --- core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java 2010-06-30 13:39:50 UTC (rev 19863) +++ core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java 2010-06-30 13:39:58 UTC (rev 19864) @@ -27,8 +27,9 @@ import org.hibernate.cache.RegionFactory; import org.hibernate.cache.infinispan.util.CacheHelper; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.test.cache.infinispan.util.CacheTestSupport; + import org.infinispan.Cache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java =================================================================== --- core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java 2010-06-30 13:39:50 UTC (rev 19863) +++ core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java 2010-06-30 13:39:58 UTC (rev 19864) @@ -10,7 +10,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.connection.ConnectionProvider; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.Statistics; import org.hibernate.transaction.CMTTransactionFactory; Modified: core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java =================================================================== --- core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java 2010-06-30 13:39:50 UTC (rev 19863) +++ core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java 2010-06-30 13:39:58 UTC (rev 19864) @@ -35,7 +35,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.classic.Session; import org.hibernate.connection.ConnectionProvider; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.test.cache.infinispan.functional.Contact; import org.hibernate.test.cache.infinispan.functional.Customer; Modified: core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java =================================================================== --- core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java 2010-06-30 13:39:50 UTC (rev 19863) +++ core/branches/gradle2/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java 2010-06-30 13:39:58 UTC (rev 19864) @@ -27,8 +27,8 @@ import org.hibernate.cfg.Mappings; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.junit.functional.ExecutionEnvironment; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.ExecutionEnvironment; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.transaction.CMTTransactionFactory; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory;