Permalink
Browse files

HHH-5616 - Switch to Gradle for builds .. infinispan

  • Loading branch information...
1 parent 429d0fd commit 8beaccc7eb33325606d8ef5df928c4782cd042e9 @sebersole sebersole committed Oct 9, 2010
Showing with 47 additions and 264 deletions.
  1. +0 −191 cache-infinispan/pom.xml
  2. +0 −36 cache-infinispan/src/test/resources/hibernate.properties
  3. +0 −37 cache-infinispan/src/test/resources/log4j.properties
  4. +46 −0 hibernate-infinispan/hibernate-infinispan.gradle
  5. 0 ...→ hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
  6. 0 ...bernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
  7. 0 ...nfinispan → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java
  8. 0 ...bernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java
  9. 0 ...-infinispan}/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java
  10. 0 ...ate-infinispan}/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java
  11. 0 ...hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/collection/ReadOnlyAccess.java
  12. 0 ...nate-infinispan}/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java
  13. 0 ...→ hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java
  14. 0 ...n → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/entity/ReadOnlyAccess.java
  15. 0 ...ibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java
  16. 0 ...ibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java
  17. 0 ...inispan → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java
  18. 0 ...te-infinispan}/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java
  19. 0 ...ibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/impl/ClassLoaderAwareCache.java
  20. 0 ...ernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java
  21. 0 ...te-infinispan}/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampTypeOverrides.java
  22. 0 ...nate-infinispan}/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java
  23. 0 ...nfinispan}/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
  24. 0 ...pan → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapter.java
  25. 0 ...→ hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java
  26. 0 ...ispan → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java
  27. 0 ...n → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java
  28. 0 ...nispan → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java
  29. 0 ...nispan → hibernate-infinispan}/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java
  30. 0 ...nate-infinispan}/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml
  31. 0 ...an}/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java
  32. 0 ...inispan}/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
  33. 0 ...-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java
  34. 0 ...ate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java
  35. 0 ...nfinispan}/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
  36. 0 ...ispan}/src/test/java/org/hibernate/test/cache/infinispan/JndiInfinispanRegionFactoryTestCase.java
  37. 0 ...n}/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java
  38. 0 ...rg/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java
  39. 0 .../src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractReadOnlyAccessTestCase.java
  40. 0 ...test/java/org/hibernate/test/cache/infinispan/collection/AbstractTransactionalAccessTestCase.java
  41. 0 ...n}/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionImplTestCase.java
  42. 0 ...rc/test/java/org/hibernate/test/cache/infinispan/collection/InvalidatedTransactionalTestCase.java
  43. 0 ...ispan}/src/test/java/org/hibernate/test/cache/infinispan/collection/ReadOnlyExtraAPITestCase.java
  44. 0 ...te-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/collection/ReadOnlyTestCase.java
  45. 0 ...}/src/test/java/org/hibernate/test/cache/infinispan/collection/TransactionalExtraAPITestCase.java
  46. 0 ...t/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java
  47. 0 ...pan}/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractReadOnlyAccessTestCase.java
  48. 0 ...src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java
  49. 0 ...nfinispan}/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java
  50. 0 ...n}/src/test/java/org/hibernate/test/cache/infinispan/entity/InvalidatedTransactionalTestCase.java
  51. 0 ...nfinispan}/src/test/java/org/hibernate/test/cache/infinispan/entity/ReadOnlyExtraAPITestCase.java
  52. 0 ...ernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/entity/ReadOnlyTestCase.java
  53. 0 ...span}/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java
  54. 0 .../src/test/java/org/hibernate/test/cache/infinispan/functional/BasicJdbcTransactionalTestCase.java
  55. 0 ...finispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicReadOnlyTestCase.java
  56. 0 ...pan}/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
  57. 0 ...infinispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java
  58. 0 ...→ hibernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/Contact.java
  59. 0 ... hibernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/Customer.java
  60. 0 ...an → hibernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/Item.java
  61. 0 ...span}/src/test/java/org/hibernate/test/cache/infinispan/functional/JndiRegionFactoryTestCase.java
  62. 0 ...-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java
  63. 0 ...rnate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/VersionedItem.java
  64. 0 ...an}/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
  65. 0 ...infinispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/Account.java
  66. 0 ...span}/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/AccountHolder.java
  67. 0 ...src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/CacheAccessListener.java
  68. 0 .../src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/ClassLoaderTestDAO.java
  69. 0 .../test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedCacheTestSetup.java
  70. 0 ...test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java
  71. 0 ...java/org/hibernate/test/cache/infinispan/functional/classloader/SelectedClassnameClassLoader.java
  72. 0 ...hibernate/test/cache/infinispan/functional/classloader/SelectedClassnameClassLoaderTestSetup.java
  73. 0 ...c/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java
  74. 0 ...t/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java
  75. 0 .../test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionImpl.java
  76. 0 ...ava/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionManagerImpl.java
  77. 0 ...ispan}/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java
  78. 0 ...java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java
  79. 0 .../org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java
  80. 0 ...est/java/org/hibernate/test/cache/infinispan/functional/cluster/RepeatableSessionRefreshTest.java
  81. 0 .../src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/SessionRefreshTestCase.java
  82. 0 ...-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
  83. 0 ...an}/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
  84. 0 ...finispan}/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
  85. 0 ...ernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java
  86. 0 ...hibernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java
  87. 0 ...te-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionManagerImpl.java
  88. 0 ...-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionManagerLookup.java
  89. 0 ...an}/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java
  90. 0 ...ibernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestSupport.java
  91. 0 ...→ hibernate-infinispan}/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java
  92. 0 ...ate-infinispan}/src/test/resources/org/hibernate/test/cache/infinispan/functional/Contact.hbm.xml
  93. 0 ...te-infinispan}/src/test/resources/org/hibernate/test/cache/infinispan/functional/Customer.hbm.xml
  94. 0 ...ernate-infinispan}/src/test/resources/org/hibernate/test/cache/infinispan/functional/Item.hbm.xml
  95. 0 ...an}/src/test/resources/org/hibernate/test/cache/infinispan/functional/classloader/Account.hbm.xml
  96. +1 −0 settings.gradle
View
@@ -1,191 +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-infinispan</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate Infinispan Integration</name>
- <description>Integration of Hibernate with Infinispan</description>
-
- <properties>
- <version.infinispan>4.2.0.ALPHA1</version.infinispan>
- <version.hsqldb>1.8.0.2</version.hsqldb>
- <version.cglib>2.2</version.cglib>
- <version.javassist>3.4.GA</version.javassist>
- <version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
- <version.xapool>1.5.0</version.xapool>
- <skipUnitTests>true</skipUnitTests>
- <!--
- Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
- may be problems with multicast on the interface JGroups uses by default on your machine. You can
- try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
- setting the value to an interface where you know multicast works
- -->
- <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>${version.infinispan}</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <!-- <scope>test</scope> TODO fix this -->
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>${version.infinispan}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${version.hsqldb}</version>
- <scope>test</scope>
- </dependency>
- <!-- this is optional on core :( and needed for testing -->
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>${version.cglib}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <scope>test</scope>
- <version>${version.org.jboss.naming}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <scope>test</scope>
- <version>${version.org.jboss.naming}</version>
- </dependency>
-
- <dependency>
- <groupId>com.experlog</groupId>
- <artifactId>xapool</artifactId>
- <scope>test</scope>
- <version>${version.xapool}</version>
- </dependency>
-
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- <version>4.9.0.GA</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- <verbose>true</verbose>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- Skip a long-running test of a prototype class -->
- <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- <property>
- <name>jgroups.bind_addr</name>
- <value>${jgroups.bind_addr}</value>
- </property>
- <!-- There are problems with multicast and IPv6 on some
- OS/JDK combos, so we tell Java to use IPv4. If you
- have problems with multicast when running the tests
- you can try setting this to 'false', although typically
- that won't be helpful.
- -->
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
- </property>
- <!-- Tell JGroups to only wait a short time for PING
- responses before determining coordinator. Speeds cluster
- formation during integration tests. (This is too
- low a value for a real system; only use for tests.)
- -->
- <property>
- <name>jgroups.ping.timeout</name>
- <value>500</value>
- </property>
- <!-- Tell JGroups to only require one PING response
- before determining coordinator. Speeds cluster
- formation during integration tests. (This is too
- low a value for a real system; only use for tests.)
- -->
- <property>
- <name>jgroups.ping.num_initial_members</name>
- <value>1</value>
- </property>
- <!-- Disable the JGroups message bundling feature
- to speed tests and avoid FLUSH issue -->
- <property>
- <name>jgroups.udp.enable_bundling</name>
- <value>false</value>
- </property>
- </systemProperties>
- <skipExec>${skipUnitTests}</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>test</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <skipUnitTests>false</skipUnitTests>
- </properties>
- </profile>
- </profiles>
-</project>
@@ -1,36 +0,0 @@
-################################################################################
-# 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
@@ -1,37 +0,0 @@
-################################################################################
-# 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
@@ -0,0 +1,46 @@
+dependencies {
+ infinispanVersion = '4.2.0.ALPHA1'
+ jnpVersion = '5.0.3.GA'
+
+ compile( project( ':hibernate-core' ) )
+ compile( [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion] ) {
+ artifact {
+ name = "infinispan-core"
+ type = 'jar'
+ }
+ }
+ // http://jira.codehaus.org/browse/GRADLE-739
+ testCompile( [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion] ) {
+ artifact {
+ name = "infinispan-core"
+ type = 'jar'
+ }
+ artifact {
+ name = "infinispan-core"
+ classifier = 'tests'
+ type = 'jar'
+ }
+ }
+ testCompile( project(':hibernate-core').sourceSets.test.classes )
+ testCompile( [group: 'org.jboss', name: 'jboss-common-core', version: '2.2.14.GA'] )
+ testCompile( [group: 'org.jboss.naming', name: 'jnp-client', version: jnpVersion] )
+ testCompile( [group: 'org.jboss.naming', name: 'jnpserver', version: jnpVersion] )
+ testCompile( [group: 'com.experlog', name: 'xapool', version: '1.5.0'] )
+ testCompile( [group: 'jboss.jbossts', name: 'jbossjta', version: '4.9.0.GA'] )
+ testCompile( libraries.jta )
+ testCompile( libraries.h2 )
+ testCompile( [group: 'org.rhq.helpers', name: 'rhq-pluginAnnotations', version: '1.4.0.B01'] )
+ testRuntime( libraries.javassist )
+}
+
+test {
+ environment['java.net.preferIPv4Stack'] = true
+ environment['jgroups.ping.timeout'] = 500
+ environment['jgroups.ping.num_initial_members'] = 1
+ environment['jgroups.udp.enable_bundling'] = false
+// environment['jgroups.bind_addr'] = $jgroupsBindAddress
+ // quite a few failures and the old maven module disabled these tests as well
+ enabled = false
+}
+
+
View
@@ -6,6 +6,7 @@ include 'hibernate-c3p0'
include 'hibernate-proxool'
include 'hibernate-ehcache'
+include 'hibernate-infinispan'
rootProject.children.each { project ->

0 comments on commit 8beaccc

Please sign in to comment.