diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/JndiMultiplexedJBossCacheRegionFactory.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/JndiMultiplexedJBossCacheRegionFactory.java index 583580e46f..56663cefcd 100644 --- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/JndiMultiplexedJBossCacheRegionFactory.java +++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/JndiMultiplexedJBossCacheRegionFactory.java @@ -33,9 +33,9 @@ import org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager; * {@link #getCacheInstanceManager() CacheInstanceManager}. *

* Supports separate JBoss Cache instances for entity, collection, query - * and timestamp caching, with the expectation that a single multiplexed - * JGroups channel will be shared between the caches. JBoss Cache instances - * are created from a factory. + * and timestamp caching, with the expectation that a single multiplexed JGroups + * resource (i.e. a multiplexed channel or a shared transport channel) will be + * shared between the caches. JBoss Cache instances are created from a factory. *

*

* This version finds the factory in JNDI. See diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/MultiplexedJBossCacheRegionFactory.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/MultiplexedJBossCacheRegionFactory.java index 9f0abb3579..438458c8ea 100644 --- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/MultiplexedJBossCacheRegionFactory.java +++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/MultiplexedJBossCacheRegionFactory.java @@ -33,9 +33,9 @@ import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; * {@link #getCacheInstanceManager() CacheInstanceManager}. *

* Supports separate JBoss Cache instances for entity, collection, query - * and timestamp caching, with the expectation that a single multiplexed - * JGroups channel will be shared between the caches. JBoss Cache instances - * are created from a factory. + * and timestamp caching, with the expectation that a single JGroups resource + * (i.e. a multiplexed channel or a shared transport channel) will be shared + * between the caches. JBoss Cache instances are created from a factory. *

*

* This version instantiates the factory itself. See diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java index 3e8c2d4b69..a25ee7dc50 100644 --- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java +++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java @@ -44,9 +44,10 @@ import org.hibernate.transaction.TransactionManagerLookup; import org.hibernate.util.PropertiesHelper; /** - * Allows building separate {@link Cache} instances for each type of region, but - * supports using the JGroups multiplexer under the covers to re-use the same group - * communication stack.

+ * Allows building separate {@link Cache} instances for each type of region, + * with the expectation that a single multiplexed JGroups resource (i.e. a + * multiplexed channel or a shared transport channel) will be shared between + * the caches.

* * @author Steve Ebersole * @author Brian Stansberry diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java index 0e86f3d829..6faae5fa60 100644 --- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java +++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java @@ -42,12 +42,14 @@ import org.hibernate.cfg.Settings; import org.hibernate.util.PropertiesHelper; /** - * A {@link CacheInstanceManager} implementation where we use a single cache - * instance we assume to be configured for invalidation if operating on a - * cluster. Under that assumption, we can store all data into the same - * {@link Cache} instance. + * A {@link CacheInstanceManager} implementation where we use a single JBoss Cache + * instance for each type of region. If operating on a cluster, the cache must + * be configured for REPL_SYNC if query caching is enabled. If query caching + * is not used, REPL_SYNC or INVALIDATION_SYNC are valid, with + * INVALIDATION_SYNC preferred. * * @author Steve Ebersole + * @author Brian Stansberry */ public class SharedCacheInstanceManager implements CacheInstanceManager {