Skip to content

Commit

Permalink
[HHH-5564] (Upgrade to Infinispan 4.2.x) Upgraded to 4.2.0.ALPHA1.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5@20635 1b8cb986-b30d-0410-93ca-fae66ebed9b2
  • Loading branch information
@galderz
galderz committed Sep 14, 2010
1 parent 5af85cd commit 91ca493
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 42 deletions.
2 changes: 1 addition & 1 deletion cache-infinispan/pom.xml
View file
Expand Up @@ -18,7 +18,7 @@
<description>Integration of Hibernate with Infinispan</description>

<properties>
<version.infinispan>4.0.0.FINAL</version.infinispan>
<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>
Expand Down
12 changes: 6 additions & 6 deletions cache-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
View file
Expand Up @@ -31,8 +31,8 @@
import org.hibernate.util.PropertiesHelper;
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;

Expand Down Expand Up @@ -132,7 +132,7 @@ public class InfinispanRegionFactory implements RegionFactory {
*/
public static final String DEF_QUERY_RESOURCE = "local-query";

private CacheManager manager;
private EmbeddedCacheManager manager;

private final Map<String, TypeOverrides> typeOverrides = new HashMap<String, TypeOverrides>();

Expand Down Expand Up @@ -227,11 +227,11 @@ public long nextTimestamp() {
return System.currentTimeMillis() / 100;
}

public void setCacheManager(CacheManager manager) {
public void setCacheManager(EmbeddedCacheManager manager) {
this.manager = manager;
}

public CacheManager getCacheManager() {
public EmbeddedCacheManager getCacheManager() {
return manager;
}

Expand Down Expand Up @@ -283,10 +283,10 @@ public Set<String> getDefinedConfigurations() {
return Collections.unmodifiableSet(definedConfigurations);
}

protected CacheManager createCacheManager(Properties properties) throws CacheException {
protected EmbeddedCacheManager createCacheManager(Properties properties) throws CacheException {
try {
String configLoc = PropertiesHelper.getString(INFINISPAN_CONFIG_RESOURCE_PROP, properties, DEF_INFINISPAN_CONFIG_RESOURCE);
CacheManager manager = new DefaultCacheManager(configLoc, false);
EmbeddedCacheManager manager = new DefaultCacheManager(configLoc, false);
String globalStats = PropertiesHelper.extractPropertyValue(INFINISPAN_GLOBAL_STATISTICS_PROP, properties);
if (globalStats != null) {
manager.getGlobalConfiguration().setExposeGlobalJmxStatistics(Boolean.parseBoolean(globalStats));
Expand Down
10 changes: 5 additions & 5 deletions ...-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
View file
Expand Up @@ -31,7 +31,7 @@
import org.hibernate.cache.RegionFactory;
import org.hibernate.util.NamingHelper;
import org.hibernate.util.PropertiesHelper;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;

Expand All @@ -47,7 +47,7 @@ public class JndiInfinispanRegionFactory extends InfinispanRegionFactory {
private static final Log log = LogFactory.getLog(JndiInfinispanRegionFactory.class);

/**
* Specifies the JNDI name under which the {@link CacheManager} to use is bound.
* Specifies the JNDI name under which the {@link EmbeddedCacheManager} to use is bound.
* There is no default value -- the user must specify the property.
*/
public static final String CACHE_MANAGER_RESOURCE_PROP = "hibernate.cache.infinispan.cachemanager";
Expand All @@ -61,18 +61,18 @@ public JndiInfinispanRegionFactory(Properties props) {
}

@Override
protected CacheManager createCacheManager(Properties properties) throws CacheException {
protected EmbeddedCacheManager createCacheManager(Properties properties) throws CacheException {
String name = PropertiesHelper.getString(CACHE_MANAGER_RESOURCE_PROP, properties, null);
if (name == null)
throw new CacheException("Configuration property " + CACHE_MANAGER_RESOURCE_PROP + " not set");
return locateCacheManager(name, NamingHelper.getJndiProperties(properties));
}

private CacheManager locateCacheManager(String jndiNamespace, Properties jndiProperties) {
private EmbeddedCacheManager locateCacheManager(String jndiNamespace, Properties jndiProperties) {
Context ctx = null;
try {
ctx = new InitialContext(jndiProperties);
return (CacheManager) ctx.lookup(jndiNamespace);
return (EmbeddedCacheManager) ctx.lookup(jndiNamespace);
} catch (NamingException ne) {
String msg = "Unable to retrieve CacheManager from JNDI [" + jndiNamespace + "]";
log.info(msg, ne);
Expand Down
28 changes: 14 additions & 14 deletions ...an/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
View file
Expand Up @@ -33,7 +33,7 @@
import org.infinispan.config.Configuration;
import org.infinispan.config.Configuration.CacheMode;
import org.infinispan.eviction.EvictionStrategy;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.manager.DefaultCacheManager;

import junit.framework.TestCase;
Expand Down Expand Up @@ -118,7 +118,7 @@ public void testBuildEntityCollectionRegionsPersonPlusEntityCollectionOverrides(
p.setProperty("hibernate.cache.infinispan.collection.eviction.max_entries", "25000");
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
manager.getGlobalConfiguration().setTransportClass(null);
try {
assertFalse(manager.getGlobalConfiguration().isExposeGlobalJmxStatistics());
Expand Down Expand Up @@ -213,7 +213,7 @@ public void testBuildEntityCollectionRegionOverridesOnly() {
p.setProperty("hibernate.cache.infinispan.collection.eviction.max_entries", "35000");
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
try {
EntityRegionImpl region = (EntityRegionImpl) factory.buildEntityRegion("com.acme.Address", p, null);
assertNull(factory.getTypeOverrides().get("com.acme.Address"));
Expand Down Expand Up @@ -250,7 +250,7 @@ public void testBuildEntityRegionPersonPlusEntityOverridesWithoutCfg() {
p.setProperty("hibernate.cache.infinispan.entity.eviction.max_entries", "10000");
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
manager.getGlobalConfiguration().setTransportClass(null);
try {
assertNotNull(factory.getTypeOverrides().get(person));
Expand All @@ -275,7 +275,7 @@ public void testTimestampValidation() {
final DefaultCacheManager manager = new DefaultCacheManager();
InfinispanRegionFactory factory = new InfinispanRegionFactory() {
@Override
protected CacheManager createCacheManager(Properties properties) throws CacheException {
protected EmbeddedCacheManager createCacheManager(Properties properties) throws CacheException {
return manager;
}
};
Expand All @@ -294,7 +294,7 @@ public void testBuildDefaultTimestampsRegion() {
Properties p = new Properties();
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
try {
assertTrue(factory.getDefinedConfigurations().contains("timestamps"));
assertTrue(factory.getTypeOverrides().get("timestamps").getCacheName().equals("timestamps"));
Expand All @@ -319,7 +319,7 @@ public void testBuildDiffCacheNameTimestampsRegion() {
p.setProperty("hibernate.cache.infinispan.timestamps.cfg", "unrecommended-timestamps");
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
try {
assertFalse(factory.getDefinedConfigurations().contains("timestamp"));
assertTrue(factory.getDefinedConfigurations().contains("unrecommended-timestamps"));
Expand All @@ -346,7 +346,7 @@ public void testBuildTimestamRegionWithCacheNameOverride() {
InfinispanRegionFactory factory = new InfinispanRegionFactory();
p.setProperty("hibernate.cache.infinispan.timestamps.cfg", "mytimestamps-cache");
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
manager.getGlobalConfiguration().setTransportClass(null);
try {
factory.buildTimestampsRegion(timestamps, p);
Expand All @@ -366,7 +366,7 @@ public void testBuildTimestamRegionWithFifoEvictionOverride() {
p.setProperty("hibernate.cache.infinispan.timestamps.eviction.max_entries", "10000");
try {
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
manager.getGlobalConfiguration().setTransportClass(null);
factory.buildTimestampsRegion(timestamps, p);
assertTrue(factory.getDefinedConfigurations().contains("mytimestamps-cache"));
Expand All @@ -386,7 +386,7 @@ public void testBuildTimestamRegionWithNoneEvictionOverride() {
p.setProperty("hibernate.cache.infinispan.timestamps.eviction.wake_up_interval", "3000");
p.setProperty("hibernate.cache.infinispan.timestamps.eviction.max_entries", "10000");
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
manager.getGlobalConfiguration().setTransportClass(null);
try {
factory.buildTimestampsRegion(timestamps, p);
Expand All @@ -401,7 +401,7 @@ public void testBuildQueryRegion() {
Properties p = new Properties();
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
manager.getGlobalConfiguration().setTransportClass(null);
try {
assertTrue(factory.getDefinedConfigurations().contains("local-query"));
Expand All @@ -424,7 +424,7 @@ public void testBuildQueryRegionWithCustomRegionName() {
p.setProperty("hibernate.cache.infinispan.myquery.eviction.wake_up_interval", "2222");
p.setProperty("hibernate.cache.infinispan.myquery.eviction.max_entries", "11111");
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
manager.getGlobalConfiguration().setTransportClass(null);
try {
assertTrue(factory.getDefinedConfigurations().contains("local-query"));
Expand Down Expand Up @@ -452,7 +452,7 @@ public void testEnableStatistics() {
p.setProperty("hibernate.cache.infinispan.entity.eviction.max_entries", "10000");
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
try {
assertTrue(manager.getGlobalConfiguration().isExposeGlobalJmxStatistics());
EntityRegionImpl region = (EntityRegionImpl) factory.buildEntityRegion("com.acme.Address", p, null);
Expand Down Expand Up @@ -500,7 +500,7 @@ public void testDisableStatistics() {
p.setProperty("hibernate.cache.infinispan.entity.eviction.max_entries", "10000");
InfinispanRegionFactory factory = new InfinispanRegionFactory();
factory.start(null, p);
CacheManager manager = factory.getCacheManager();
EmbeddedCacheManager manager = factory.getCacheManager();
try {
assertFalse(manager.getGlobalConfiguration().isExposeGlobalJmxStatistics());
EntityRegionImpl region = (EntityRegionImpl) factory.buildEntityRegion("com.acme.Address", p, null);
Expand Down
11 changes: 6 additions & 5 deletions ...a/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java
View file
Expand Up @@ -34,7 +34,8 @@
import org.hibernate.test.cache.infinispan.functional.cluster.ClusterAwareRegionFactory;
import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaTransactionManagerImpl;
import org.infinispan.Cache;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.CacheContainer;
import org.infinispan.manager.EmbeddedCacheManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -120,11 +121,11 @@ protected void cleanupTest() throws Exception {
public void testIsolatedSetup() throws Exception {
// Bind a listener to the "local" cache
// Our region factory makes its CacheManager available to us
CacheManager localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
CacheContainer localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
Cache localReplicatedCache = localManager.getCache("replicated-entity");

// Bind a listener to the "remote" cache
CacheManager remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
CacheContainer remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
Cache remoteReplicatedCache = remoteManager.getCache("replicated-entity");

ClassLoader cl = Thread.currentThread().getContextClassLoader();
Expand Down Expand Up @@ -164,9 +165,9 @@ public void testClassLoaderHandlingStandardQueryCache() throws Exception {
protected void queryTest(boolean useNamedRegion) throws Exception {
// Bind a listener to the "local" cache
// Our region factory makes its CacheManager available to us
CacheManager localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
EmbeddedCacheManager localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
// Bind a listener to the "remote" cache
CacheManager remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
EmbeddedCacheManager remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
String cacheName;
if (useNamedRegion) {
cacheName = "AccountRegion"; // As defined by ClassLoaderTestDAO via calls to query.setCacheRegion
Expand Down
12 changes: 6 additions & 6 deletions ...ava/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java
View file
Expand Up @@ -34,7 +34,7 @@
import org.hibernate.cache.access.AccessType;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cfg.Settings;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;

Expand All @@ -47,7 +47,7 @@
public class ClusterAwareRegionFactory implements RegionFactory {

private static final Log log = LogFactory.getLog(ClusterAwareRegionFactory.class);
private static final Hashtable<String, CacheManager> cacheManagers = new Hashtable<String, CacheManager>();
private static final Hashtable<String, EmbeddedCacheManager> cacheManagers = new Hashtable<String, EmbeddedCacheManager>();

private final InfinispanRegionFactory delegate = new InfinispanRegionFactory();
private String cacheManagerName;
Expand All @@ -56,16 +56,16 @@ public class ClusterAwareRegionFactory implements RegionFactory {
public ClusterAwareRegionFactory(Properties props) {
}

public static CacheManager getCacheManager(String name) {
public static EmbeddedCacheManager getCacheManager(String name) {
return cacheManagers.get(name);
}

public static void addCacheManager(String name, CacheManager manager) {
public static void addCacheManager(String name, EmbeddedCacheManager manager) {
cacheManagers.put(name, manager);
}

public static void clearCacheManagers() {
for (CacheManager manager : cacheManagers.values()) {
for (EmbeddedCacheManager manager : cacheManagers.values()) {
try {
manager.stop();
} catch (Exception e) {
Expand All @@ -78,7 +78,7 @@ public static void clearCacheManagers() {
public void start(Settings settings, Properties properties) throws CacheException {
cacheManagerName = properties.getProperty(DualNodeTestCase.NODE_ID_PROP);

CacheManager existing = getCacheManager(cacheManagerName);
EmbeddedCacheManager existing = getCacheManager(cacheManagerName);
locallyAdded = (existing == null);

if (locallyAdded) {
Expand Down
6 changes: 3 additions & 3 deletions ...ernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java
View file
Expand Up @@ -34,7 +34,7 @@
import org.hibernate.test.cache.infinispan.functional.Contact;
import org.hibernate.test.cache.infinispan.functional.Customer;
import org.infinispan.Cache;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.CacheContainer;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
import org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent;
Expand Down Expand Up @@ -67,7 +67,7 @@ public void testAll() throws Exception {

// Bind a listener to the "local" cache
// Our region factory makes its CacheManager available to us
CacheManager localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
CacheContainer localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
// Cache localCache = localManager.getCache("entity");
Cache localCustomerCache = localManager.getCache(Customer.class.getName());
Cache localContactCache = localManager.getCache(Contact.class.getName());
Expand All @@ -79,7 +79,7 @@ public void testAll() throws Exception {
TransactionManager localTM = DualNodeJtaTransactionManagerImpl.getInstance(DualNodeTestCase.LOCAL);

// Bind a listener to the "remote" cache
CacheManager remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
CacheContainer remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
Cache remoteCustomerCache = remoteManager.getCache(Customer.class.getName());
Cache remoteContactCache = remoteManager.getCache(Contact.class.getName());
Cache remoteCollectionCache = remoteManager.getCache(Customer.class.getName() + ".contacts");
Expand Down
6 changes: 4 additions & 2 deletions ...t/java/org/hibernate/test/cache/infinispan/functional/cluster/SessionRefreshTestCase.java
View file
Expand Up @@ -30,7 +30,7 @@
import org.hibernate.test.cache.infinispan.functional.classloader.Account;
import org.hibernate.test.cache.infinispan.functional.classloader.ClassLoaderTestDAO;
import org.infinispan.Cache;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.CacheContainer;
import org.infinispan.test.TestingUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -90,12 +90,14 @@ protected void cleanupTransactionManagement() {

public void testRefreshAfterExternalChange() throws Exception {
// First session factory uses a cache
CacheManager localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
CacheContainer localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
localCache = localManager.getCache(Account.class.getName());
TransactionManager localTM = DualNodeJtaTransactionManagerImpl.getInstance(DualNodeTestCase.LOCAL);
SessionFactory localFactory = getEnvironment().getSessionFactory();

// Second session factory doesn't; just needs a transaction manager
// However, start at least the cache to avoid issues with replication and cache not being there
ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE).getCache(Account.class.getName());
TransactionManager remoteTM = DualNodeJtaTransactionManagerImpl.getInstance(DualNodeTestCase.REMOTE);
SessionFactory remoteFactory = getSecondNodeEnvironment().getSessionFactory();

Expand Down

0 comments on commit 91ca493

Please sign in to comment.