Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[HHH-5669] (Fix gradle build issues with Infinispan 2LC) Fix several issues to get build and unit tests working. Upgraded to Infinispan 4.2.0.ALPHA3 as well.

This commit is contained in:
Galder Zamarreño 2010-10-15 18:24:44 +02:00
parent ae557f7f3b
commit 2de00decc6
3 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
hibernate-infinispan/hibernate-infinispan.gradle
View File

@ -1,46 +1,47 @@
dependencies {
infinispanVersion = '4.2.0.ALPHA1'
jnpVersion = '5.0.3.GA'
infinispanVersion = '4.2.0.ALPHA3'
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 )
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: 'hsqldb', name: 'hsqldb', version: '1.8.0.2'] )
testCompile([group: 'org.rhq.helpers', name: 'rhq-pluginAnnotations', version: '1.4.0.B01'])
testCompile([group: 'log4j', name: 'log4j', version: '1.2.16'])
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
systemProperties['java.net.preferIPv4Stack'] = true
systemProperties['jgroups.ping.timeout'] = 500
systemProperties['jgroups.ping.num_initial_members'] = 1
systemProperties['jgroups.udp.enable_bundling'] = false
systemProperties['jgroups.bind_addr'] = 'localhost'
// systemProperties['log4j.configuration'] = 'file:/log4j/log4j-infinispan.xml'
enabled = true
}

4
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java vendored
View File

@ -220,8 +220,8 @@ public class JBossStandaloneJtaExampleTest extends TestCase {
private void bindDataSource() throws Exception {
ExtendedXADataSource xads = new ExtendedXADataSource();
xads.setDriverName("org.hsqldb.jdbcDriver");
xads.setUrl("jdbc:hsqldb:mem:/test");
xads.setDriverName("org.h2.Driver");
xads.setUrl("jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE");
ctx.bind("java:/MyDatasource", xads);
}

8
hibernate-infinispan/src/test/resources/hibernate.properties
View File

@ -21,11 +21,11 @@
# 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.dialect org.hibernate.dialect.H2Dialect
hibernate.connection.driver_class org.h2.Driver
hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
hibernate.connection.username sa
hibernate.connection.password
# hibernate.connection.password
hibernate.connection.pool_size 5