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

Reduce use of "multiplexer" in names; use JGroups 

Small Javadoc changes

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@14352 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Brian Stansberry 2008-02-23 23:52:40 +00:00
parent 15fc10a1e4
commit 6796d3f7c3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java vendored
View File

@ -46,9 +46,7 @@ import org.hibernate.util.PropertiesHelper;
/** /**
* Allows building separate {@link Cache} instances for each type of region, but * 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 * supports using the JGroups multiplexer under the covers to re-use the same group
* communication stack. <p/> todo : replace the prototype cache factory with * communication stack. <p/>
* the equivalent JBoss Cache solution from
* http://jira.jboss.com/jira/browse/JBCACHE-1156
* *
* @author Steve Ebersole * @author Steve Ebersole
* @author Brian Stansberry * @author Brian Stansberry
@ -58,20 +56,20 @@ public class MultiplexingCacheInstanceManager implements CacheInstanceManager {
private static final Logger log = LoggerFactory.getLogger(MultiplexingCacheInstanceManager.class); private static final Logger log = LoggerFactory.getLogger(MultiplexingCacheInstanceManager.class);
/** /**
* Classpath or filesystem resource identifying containing JBoss Cache * Classpath or filesystem resource containing JBoss Cache
* configurations the factory should use. * configurations the factory should use.
* *
* @see #DEF_CACHE_FACTORY_RESOURCE * @see #DEF_CACHE_FACTORY_RESOURCE
*/ */
public static final String CACHE_FACTORY_RESOURCE_PROP = "hibernate.cache.region.jbc2.configs"; public static final String CACHE_FACTORY_RESOURCE_PROP = "hibernate.cache.region.jbc2.configs";
/** /**
* Classpath or filesystem resource identifying containing JGroups protocol * Classpath or filesystem resource containing JGroups protocol
* stack configurations the <code>org.jgroups.ChannelFactory</code> * stack configurations the <code>org.jgroups.ChannelFactory</code>
* should use. * should use.
* *
* @see #DEF_MULTIPLEXER_RESOURCE * @see #DEF_JGROUPS_RESOURCE
*/ */
public static final String CHANNEL_FACTORY_RESOURCE_PROP = "hibernate.cache.region.jbc2.multiplexer.stacks"; public static final String CHANNEL_FACTORY_RESOURCE_PROP = "hibernate.cache.region.jbc2.jgroups.stacks";
/** /**
* Name of the configuration that should be used for entity caches. * Name of the configuration that should be used for entity caches.
@ -110,7 +108,7 @@ public class MultiplexingCacheInstanceManager implements CacheInstanceManager {
* Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies * Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies
* the "jgroups-stacks.xml" file in this package. * the "jgroups-stacks.xml" file in this package.
*/ */
public static final String DEF_MULTIPLEXER_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml"; public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml";
/** /**
* Default value for {@link #ENTITY_CACHE_RESOURCE_PROP}. * Default value for {@link #ENTITY_CACHE_RESOURCE_PROP}.
*/ */
@ -280,7 +278,7 @@ public class MultiplexingCacheInstanceManager implements CacheInstanceManager {
if (buildCaches && jbcFactory == null) { if (buildCaches && jbcFactory == null) {
// See if the user configured a multiplexer stack // See if the user configured a multiplexer stack
if (channelFactory == null) { if (channelFactory == null) {
String muxStacks = PropertiesHelper.getString(CHANNEL_FACTORY_RESOURCE_PROP, properties, DEF_MULTIPLEXER_RESOURCE); String muxStacks = PropertiesHelper.getString(CHANNEL_FACTORY_RESOURCE_PROP, properties, DEF_JGROUPS_RESOURCE);
if (muxStacks != null) { if (muxStacks != null) {
channelFactory = new JChannelFactory(); channelFactory = new JChannelFactory();
channelFactory.setMultiplexerConfig(muxStacks); channelFactory.setMultiplexerConfig(muxStacks);