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

HHH-6674 Upgraded to Infinispan 5.0.1.FINAL

This commit is contained in:
Galder Zamarreño 2011-09-27 11:34:21 +02:00
parent 50bbfa1002
commit 4a3a59047f
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ configurations {
}
dependencies {
infinispanVersion = '5.0.0.CR4'
infinispanVersion = '5.0.1.FINAL'
jnpVersion = '5.0.3.GA'
compile(project(':hibernate-core'))
@ -32,7 +32,7 @@ dependencies {
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([group: 'org.jboss.jbossts', name: 'jbossjta', version: '4.15.1.Final'])
testCompile(libraries.jta)
testCompile(libraries.h2)
// testCompile( [group: 'hsqldb', name: 'hsqldb', version: '1.8.0.2'] )

18
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java vendored
View File

@ -117,12 +117,18 @@ public class TypeOverrides {
public Configuration createInfinispanConfiguration() {
Configuration cacheCfg = new Configuration();
if (overridden.contains("evictionStrategy")) cacheCfg.setEvictionStrategy(evictionStrategy);
if (overridden.contains("evictionWakeUpInterval")) cacheCfg.setEvictionWakeUpInterval(evictionWakeUpInterval);
if (overridden.contains("evictionMaxEntries")) cacheCfg.setEvictionMaxEntries(evictionMaxEntries);
if (overridden.contains("expirationLifespan")) cacheCfg.setExpirationLifespan(expirationLifespan);
if (overridden.contains("expirationMaxIdle")) cacheCfg.setExpirationMaxIdle(expirationMaxIdle);
if (overridden.contains("isExposeStatistics")) cacheCfg.setExposeJmxStatistics(isExposeStatistics);
if (overridden.contains("evictionStrategy"))
cacheCfg.fluent().eviction().strategy(evictionStrategy);
if (overridden.contains("evictionWakeUpInterval"))
cacheCfg.fluent().expiration().wakeUpInterval(evictionWakeUpInterval);
if (overridden.contains("evictionMaxEntries"))
cacheCfg.fluent().eviction().maxEntries(evictionMaxEntries);
if (overridden.contains("expirationLifespan"))
cacheCfg.fluent().expiration().lifespan(expirationLifespan);
if (overridden.contains("expirationMaxIdle"))
cacheCfg.fluent().expiration().maxIdle(expirationMaxIdle);
if (overridden.contains("isExposeStatistics") && isExposeStatistics)
cacheCfg.fluent().jmxStatistics();
return cacheCfg;
}

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

@ -76,9 +76,11 @@ public class JBossStandaloneJtaExampleTest extends TestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
jndiServer = startJndiServer();
ctx = createJndiContext();
// Inject configuration to initialise transaction manager from config classloader
lookup.init(new org.infinispan.config.Configuration());
bindTransactionManager();
bindUserTransaction();
bindDataSource();