[infinispan-commits] Infinispan SVN: r1552 - trunk/core/src/main/java/org/infinispan/manager.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Feb 25 05:50:38 EST 2010
Author: galder.zamarreno at jboss.com
Date: 2010-02-25 05:50:38 -0500 (Thu, 25 Feb 2010)
New Revision: 1552
Modified:
trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
Log:
[ISPN-355] (DefaultCacheManager fails to start when TRACE logging as been enabled) Reinstate component registry null checks and remove tabbed formatting.
Modified: trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2010-02-25 10:50:28 UTC (rev 1551)
+++ trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2010-02-25 10:50:38 UTC (rev 1552)
@@ -28,7 +28,6 @@
import org.infinispan.config.ConfigurationValidatingVisitor;
import org.infinispan.config.GlobalConfiguration;
import org.infinispan.config.InfinispanConfiguration;
-import org.infinispan.config.parsing.XmlConfigurationParser;
import org.infinispan.factories.GlobalComponentRegistry;
import org.infinispan.factories.InternalCacheFactory;
import org.infinispan.factories.annotations.SurvivesRestarts;
@@ -66,49 +65,39 @@
import java.util.concurrent.ConcurrentMap;
/**
- * A <tt>CacheManager</tt> is the primary mechanism for retrieving a
- * {@link Cache} instance, and is often used as a starting point to using the
- * {@link Cache}.
+ * A <tt>CacheManager</tt> is the primary mechanism for retrieving a {@link Cache} instance, and is often used as a
+ * starting point to using the {@link Cache}.
* <p/>
- * <tt>CacheManager</tt>s are heavyweight objects, and we foresee no more than
- * one <tt>CacheManager</tt> being used per JVM (unless specific configuration
- * requirements require more than one; but either way, this would be a minimal
- * and finite number of instances).
+ * <tt>CacheManager</tt>s are heavyweight objects, and we foresee no more than one <tt>CacheManager</tt> being used per
+ * JVM (unless specific configuration requirements require more than one; but either way, this would be a minimal and
+ * finite number of instances).
* <p/>
- * Constructing a <tt>CacheManager</tt> is done via one of its constructors,
- * which optionally take in a {@link org.infinispan.config.Configuration} or a
- * path or URL to a configuration XML file.
+ * Constructing a <tt>CacheManager</tt> is done via one of its constructors, which optionally take in a {@link
+ * org.infinispan.config.Configuration} or a path or URL to a configuration XML file.
* <p/>
- * Lifecycle - <tt>CacheManager</tt>s have a lifecycle (it implements
- * {@link Lifecycle}) and the default constructors also call {@link #start()}.
- * Overloaded versions of the constructors are available, that do not start the
- * <tt>CacheManager</tt>, although it must be kept in mind that
- * <tt>CacheManager</tt>s need to be started before they can be used to create
- * <tt>Cache</tt> instances.
+ * Lifecycle - <tt>CacheManager</tt>s have a lifecycle (it implements {@link Lifecycle}) and the default constructors
+ * also call {@link #start()}. Overloaded versions of the constructors are available, that do not start the
+ * <tt>CacheManager</tt>, although it must be kept in mind that <tt>CacheManager</tt>s need to be started before they
+ * can be used to create <tt>Cache</tt> instances.
* <p/>
- * Once constructed, <tt>CacheManager</tt>s should be made available to any
- * component that requires a <tt>Cache</tt>, via JNDI or via some other
- * mechanism such as an IoC container.
+ * Once constructed, <tt>CacheManager</tt>s should be made available to any component that requires a <tt>Cache</tt>,
+ * via JNDI or via some other mechanism such as an IoC container.
* <p/>
- * You obtain <tt>Cache</tt> instances from the <tt>CacheManager</tt> by using
- * one of the overloaded <tt>getCache()</tt>, methods. Note that with
- * <tt>getCache()</tt>, there is no guarantee that the instance you get is
- * brand-new and empty, since caches are named and shared. Because of this, the
- * <tt>CacheManager</tt> also acts as a repository of <tt>Cache</tt>s, and is an
- * effective mechanism of looking up or creating <tt>Cache</tt>s on demand.
+ * You obtain <tt>Cache</tt> instances from the <tt>CacheManager</tt> by using one of the overloaded
+ * <tt>getCache()</tt>, methods. Note that with <tt>getCache()</tt>, there is no guarantee that the instance you get is
+ * brand-new and empty, since caches are named and shared. Because of this, the <tt>CacheManager</tt> also acts as a
+ * repository of <tt>Cache</tt>s, and is an effective mechanism of looking up or creating <tt>Cache</tt>s on demand.
* <p/>
- * When the system shuts down, it should call {@link #stop()} on the
- * <tt>CacheManager</tt>. This will ensure all caches within its scope are
- * properly stopped as well.
+ * When the system shuts down, it should call {@link #stop()} on the <tt>CacheManager</tt>. This will ensure all caches
+ * within its scope are properly stopped as well.
* <p/>
- * Sample usage:
- * <code> CacheManager manager = CacheManager.getInstance("my-config-file.xml"); Cache entityCache =
+ * Sample usage: <code> CacheManager manager = CacheManager.getInstance("my-config-file.xml"); Cache entityCache =
* manager.getCache("myEntityCache"); entityCache.put("aPerson", new Person());
* <p/>
* Configuration myNewConfiguration = new Configuration(); myNewConfiguration.setCacheMode(Configuration.CacheMode.LOCAL);
* manager.defineConfiguration("myLocalCache", myNewConfiguration); Cache localCache = manager.getCache("myLocalCache");
* </code>
- *
+ *
* @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
* @author Galder Zamarreño
* @since 4.0
@@ -117,549 +106,499 @@
@SurvivesRestarts
@MBean(objectName = DefaultCacheManager.OBJECT_NAME, description = "Component that acts as a manager, factory and container for caches in the system.")
public class DefaultCacheManager implements CacheManager {
- public static final String DEFAULT_CACHE_NAME = "___defaultcache";
- public static final String OBJECT_NAME = "CacheManager";
- private static final Log log = LogFactory.getLog(DefaultCacheManager.class);
- protected final GlobalConfiguration globalConfiguration;
- protected final Configuration defaultConfiguration;
- private final ConcurrentMap<String, Cache> caches = new ConcurrentHashMap<String, Cache>();
- private final ConcurrentMap<String, Configuration> configurationOverrides = new ConcurrentHashMap<String, Configuration>();
- private final GlobalComponentRegistry globalComponentRegistry;
+ public static final String DEFAULT_CACHE_NAME = "___defaultcache";
+ public static final String OBJECT_NAME = "CacheManager";
+ private static final Log log = LogFactory.getLog(DefaultCacheManager.class);
+ protected final GlobalConfiguration globalConfiguration;
+ protected final Configuration defaultConfiguration;
+ private final ConcurrentMap<String, Cache> caches = new ConcurrentHashMap<String, Cache>();
+ private final ConcurrentMap<String, Configuration> configurationOverrides = new ConcurrentHashMap<String, Configuration>();
+ private final GlobalComponentRegistry globalComponentRegistry;
- /**
- * Constructs and starts a default instance of the CacheManager, using
- * configuration defaults.
- */
- public DefaultCacheManager() {
- this(null, null, true);
- }
+ /**
+ * Constructs and starts a default instance of the CacheManager, using configuration defaults.
+ */
+ public DefaultCacheManager() {
+ this(null, null, true);
+ }
- /**
- * Constructs a default instance of the CacheManager, using configuration
- * defaults.
- *
- * @param start
- * if true, the cache manager is started
- */
- public DefaultCacheManager(boolean start) {
- this(null, null, start);
- }
+ /**
+ * Constructs a default instance of the CacheManager, using configuration defaults.
+ *
+ * @param start if true, the cache manager is started
+ */
+ public DefaultCacheManager(boolean start) {
+ this(null, null, start);
+ }
- /**
- * Constructs and starts a new instance of the CacheManager, using the
- * default configuration passed in. Uses defaults for a
- * {@link org.infinispan.config.GlobalConfiguration}.
- *
- * @param defaultConfiguration
- * configuration to use as a template for all caches created
- */
- public DefaultCacheManager(Configuration defaultConfiguration) {
- this(null, defaultConfiguration, true);
- }
+ /**
+ * Constructs and starts a new instance of the CacheManager, using the default configuration passed in. Uses defaults
+ * for a {@link org.infinispan.config.GlobalConfiguration}.
+ *
+ * @param defaultConfiguration configuration to use as a template for all caches created
+ */
+ public DefaultCacheManager(Configuration defaultConfiguration) {
+ this(null, defaultConfiguration, true);
+ }
- /**
- * Constructs a new instance of the CacheManager, using the default
- * configuration passed in. Uses defaults for a
- * {@link org.infinispan.config.GlobalConfiguration}.
- *
- * @param defaultConfiguration
- * configuration file to use as a template for all caches created
- * @param start
- * if true, the cache manager is started
- */
- public DefaultCacheManager(Configuration defaultConfiguration, boolean start) {
- this(null, defaultConfiguration, start);
- }
+ /**
+ * Constructs a new instance of the CacheManager, using the default configuration passed in. Uses defaults for a {@link
+ * org.infinispan.config.GlobalConfiguration}.
+ *
+ * @param defaultConfiguration configuration file to use as a template for all caches created
+ * @param start if true, the cache manager is started
+ */
+ public DefaultCacheManager(Configuration defaultConfiguration, boolean start) {
+ this(null, defaultConfiguration, start);
+ }
- /**
- * Constructs and starts a new instance of the CacheManager, using the
- * global configuration passed in, and system defaults for the default named
- * cache configuration.
- *
- * @param globalConfiguration
- * GlobalConfiguration to use for all caches created
- */
- public DefaultCacheManager(GlobalConfiguration globalConfiguration) {
- this(globalConfiguration, null, true);
- }
+ /**
+ * Constructs and starts a new instance of the CacheManager, using the global configuration passed in, and system
+ * defaults for the default named cache configuration.
+ *
+ * @param globalConfiguration GlobalConfiguration to use for all caches created
+ */
+ public DefaultCacheManager(GlobalConfiguration globalConfiguration) {
+ this(globalConfiguration, null, true);
+ }
- /**
- * Constructs a new instance of the CacheManager, using the global
- * configuration passed in, and system defaults for the default named cache
- * configuration.
- *
- * @param globalConfiguration
- * GlobalConfiguration to use for all caches created
- * @param start
- * if true, the cache manager is started.
- */
- public DefaultCacheManager(GlobalConfiguration globalConfiguration, boolean start) {
- this(globalConfiguration, null, start);
- }
+ /**
+ * Constructs a new instance of the CacheManager, using the global configuration passed in, and system defaults for the
+ * default named cache configuration.
+ *
+ * @param globalConfiguration GlobalConfiguration to use for all caches created
+ * @param start if true, the cache manager is started.
+ */
+ public DefaultCacheManager(GlobalConfiguration globalConfiguration, boolean start) {
+ this(globalConfiguration, null, start);
+ }
- /**
- * Constructs and starts a new instance of the CacheManager, using the
- * global and default configurations passed in. If either of these are null,
- * system defaults are used.
- *
- * @param globalConfiguration
- * global configuration to use. If null, a default instance is
- * created.
- * @param defaultConfiguration
- * default configuration to use. If null, a default instance is
- * created.
- */
- public DefaultCacheManager(GlobalConfiguration globalConfiguration, Configuration defaultConfiguration) {
- this(globalConfiguration, defaultConfiguration, true);
- }
+ /**
+ * Constructs and starts a new instance of the CacheManager, using the global and default configurations passed in. If
+ * either of these are null, system defaults are used.
+ *
+ * @param globalConfiguration global configuration to use. If null, a default instance is created.
+ * @param defaultConfiguration default configuration to use. If null, a default instance is created.
+ */
+ public DefaultCacheManager(GlobalConfiguration globalConfiguration, Configuration defaultConfiguration) {
+ this(globalConfiguration, defaultConfiguration, true);
+ }
- /**
- * Constructs a new instance of the CacheManager, using the global and
- * default configurations passed in. If either of these are null, system
- * defaults are used.
- *
- * @param globalConfiguration
- * global configuration to use. If null, a default instance is
- * created.
- * @param defaultConfiguration
- * default configuration to use. If null, a default instance is
- * created.
- * @param start
- * if true, the cache manager is started
- */
- public DefaultCacheManager(GlobalConfiguration globalConfiguration, Configuration defaultConfiguration,
- boolean start) {
- this.globalConfiguration = globalConfiguration == null ? new GlobalConfiguration() : globalConfiguration
- .clone();
- this.defaultConfiguration = defaultConfiguration == null ? new Configuration() : defaultConfiguration.clone();
- globalComponentRegistry = new GlobalComponentRegistry(this.globalConfiguration, this);
- if (start)
- start();
- }
+ /**
+ * Constructs a new instance of the CacheManager, using the global and default configurations passed in. If either of
+ * these are null, system defaults are used.
+ *
+ * @param globalConfiguration global configuration to use. If null, a default instance is created.
+ * @param defaultConfiguration default configuration to use. If null, a default instance is created.
+ * @param start if true, the cache manager is started
+ */
+ public DefaultCacheManager(GlobalConfiguration globalConfiguration, Configuration defaultConfiguration,
+ boolean start) {
+ this.globalConfiguration = globalConfiguration == null ? new GlobalConfiguration() : globalConfiguration
+ .clone();
+ this.defaultConfiguration = defaultConfiguration == null ? new Configuration() : defaultConfiguration.clone();
+ globalComponentRegistry = new GlobalComponentRegistry(this.globalConfiguration, this);
+ if (start)
+ start();
+ }
- /**
- * Constructs and starts a new instance of the CacheManager, using the
- * configuration file name passed in. This constructor first searches for
- * the named file on the classpath, and failing that, treats the file name
- * as an absolute path.
- *
- * @param configurationFile
- * name of configuration file to use as a template for all caches
- * created
- * @throws java.io.IOException
- * if there is a problem with the configuration file.
- */
- public DefaultCacheManager(String configurationFile) throws IOException {
- this(configurationFile, true);
- }
+ /**
+ * Constructs and starts a new instance of the CacheManager, using the configuration file name passed in. This
+ * constructor first searches for the named file on the classpath, and failing that, treats the file name as an
+ * absolute path.
+ *
+ * @param configurationFile name of configuration file to use as a template for all caches created
+ * @throws java.io.IOException if there is a problem with the configuration file.
+ */
+ public DefaultCacheManager(String configurationFile) throws IOException {
+ this(configurationFile, true);
+ }
- /**
- * Constructs a new instance of the CacheManager, using the configuration
- * file name passed in. This constructor first searches for the named file
- * on the classpath, and failing that, treats the file name as an absolute
- * path.
- *
- * @param configurationFile
- * name of configuration file to use as a template for all caches
- * created
- * @param start
- * if true, the cache manager is started
- * @throws java.io.IOException
- * if there is a problem with the configuration file.
- */
- public DefaultCacheManager(String configurationFile, boolean start) throws IOException {
- try {
- InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration(
- configurationFile, InfinispanConfiguration.resolveSchemaPath(),
- new ConfigurationValidatingVisitor());
+ /**
+ * Constructs a new instance of the CacheManager, using the configuration file name passed in. This constructor first
+ * searches for the named file on the classpath, and failing that, treats the file name as an absolute path.
+ *
+ * @param configurationFile name of configuration file to use as a template for all caches created
+ * @param start if true, the cache manager is started
+ * @throws java.io.IOException if there is a problem with the configuration file.
+ */
+ public DefaultCacheManager(String configurationFile, boolean start) throws IOException {
+ try {
+ InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration(
+ configurationFile, InfinispanConfiguration.resolveSchemaPath(),
+ new ConfigurationValidatingVisitor());
- globalConfiguration = configuration.parseGlobalConfiguration();
- defaultConfiguration = configuration.parseDefaultConfiguration();
- for (Map.Entry<String, Configuration> entry : configuration.parseNamedConfigurations().entrySet()) {
- Configuration c = defaultConfiguration.clone();
- c.applyOverrides(entry.getValue());
- configurationOverrides.put(entry.getKey(), c);
- }
- globalComponentRegistry = new GlobalComponentRegistry(globalConfiguration, this);
- } catch (RuntimeException re) {
- throw new ConfigurationException(re);
- }
- if (start)
- start();
- }
+ globalConfiguration = configuration.parseGlobalConfiguration();
+ defaultConfiguration = configuration.parseDefaultConfiguration();
+ for (Map.Entry<String, Configuration> entry : configuration.parseNamedConfigurations().entrySet()) {
+ Configuration c = defaultConfiguration.clone();
+ c.applyOverrides(entry.getValue());
+ configurationOverrides.put(entry.getKey(), c);
+ }
+ globalComponentRegistry = new GlobalComponentRegistry(globalConfiguration, this);
+ } catch (RuntimeException re) {
+ throw new ConfigurationException(re);
+ }
+ if (start)
+ start();
+ }
- /**
- * Constructs and starts a new instance of the CacheManager, using the input
- * stream passed in to read configuration file contents.
- *
- * @param configurationStream
- * stream containing configuration file contents, to use as a
- * template for all caches created
- * @throws java.io.IOException
- * if there is a problem with the configuration stream.
- */
- public DefaultCacheManager(InputStream configurationStream) throws IOException {
- this(configurationStream, true);
- }
+ /**
+ * Constructs and starts a new instance of the CacheManager, using the input stream passed in to read configuration
+ * file contents.
+ *
+ * @param configurationStream stream containing configuration file contents, to use as a template for all caches
+ * created
+ * @throws java.io.IOException if there is a problem with the configuration stream.
+ */
+ public DefaultCacheManager(InputStream configurationStream) throws IOException {
+ this(configurationStream, true);
+ }
- /**
- * Constructs a new instance of the CacheManager, using the input stream
- * passed in to read configuration file contents.
- *
- * @param configurationStream
- * stream containing configuration file contents, to use as a
- * template for all caches created
- * @param start
- * if true, the cache manager is started
- * @throws java.io.IOException
- * if there is a problem reading the configuration stream
- */
- public DefaultCacheManager(InputStream configurationStream, boolean start) throws IOException {
- try {
- InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration(
- configurationStream, InfinispanConfiguration.findSchemaInputStream(),
- new ConfigurationValidatingVisitor());
- globalConfiguration = configuration.parseGlobalConfiguration();
- defaultConfiguration = configuration.parseDefaultConfiguration();
- for (Map.Entry<String, Configuration> entry : configuration.parseNamedConfigurations().entrySet()) {
- Configuration c = defaultConfiguration.clone();
- c.applyOverrides(entry.getValue());
- configurationOverrides.put(entry.getKey(), c);
- }
- globalComponentRegistry = new GlobalComponentRegistry(globalConfiguration, this);
- } catch (ConfigurationException ce) {
- throw ce;
- } catch (RuntimeException re) {
- throw new ConfigurationException(re);
- }
- if (start)
- start();
- }
+ /**
+ * Constructs a new instance of the CacheManager, using the input stream passed in to read configuration file
+ * contents.
+ *
+ * @param configurationStream stream containing configuration file contents, to use as a template for all caches
+ * created
+ * @param start if true, the cache manager is started
+ * @throws java.io.IOException if there is a problem reading the configuration stream
+ */
+ public DefaultCacheManager(InputStream configurationStream, boolean start) throws IOException {
+ try {
+ InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration(
+ configurationStream, InfinispanConfiguration.findSchemaInputStream(),
+ new ConfigurationValidatingVisitor());
+ globalConfiguration = configuration.parseGlobalConfiguration();
+ defaultConfiguration = configuration.parseDefaultConfiguration();
+ for (Map.Entry<String, Configuration> entry : configuration.parseNamedConfigurations().entrySet()) {
+ Configuration c = defaultConfiguration.clone();
+ c.applyOverrides(entry.getValue());
+ configurationOverrides.put(entry.getKey(), c);
+ }
+ globalComponentRegistry = new GlobalComponentRegistry(globalConfiguration, this);
+ } catch (ConfigurationException ce) {
+ throw ce;
+ } catch (RuntimeException re) {
+ throw new ConfigurationException(re);
+ }
+ if (start)
+ start();
+ }
- /**
- * Constructs a new instance of the CacheManager, using the two
- * configuration file names passed in. The first file contains the
- * GlobalConfiguration configuration The second file contain the Default
- * configuration. The third filename contains the named cache configuration
- * This constructor first searches for the named file on the classpath, and
- * failing that, treats the file name as an absolute path.
- *
- * @param start
- * if true, the cache manager is started
- * @param globalConfigurationFile
- * name of file that contains the global configuration
- * @param defaultConfigurationFile
- * name of file that contains the default configuration
- * @param namedCacheFile
- * name of file that contains the named cache configuration
- *
- * @throws java.io.IOException
- * if there is a problem with the configuration file.
- */
- public DefaultCacheManager(String globalConfigurationFile, String defaultConfigurationFile, String namedCacheFile,
- boolean start) throws IOException {
- try {
- InfinispanConfiguration gconfiguration = InfinispanConfiguration.newInfinispanConfiguration(
- globalConfigurationFile, InfinispanConfiguration.resolveSchemaPath(),
- new ConfigurationValidatingVisitor());
+ /**
+ * Constructs a new instance of the CacheManager, using the two configuration file names passed in. The first file
+ * contains the GlobalConfiguration configuration The second file contain the Default configuration. The third filename
+ * contains the named cache configuration This constructor first searches for the named file on the classpath, and
+ * failing that, treats the file name as an absolute path.
+ *
+ * @param start if true, the cache manager is started
+ * @param globalConfigurationFile name of file that contains the global configuration
+ * @param defaultConfigurationFile name of file that contains the default configuration
+ * @param namedCacheFile name of file that contains the named cache configuration
+ * @throws java.io.IOException if there is a problem with the configuration file.
+ */
+ public DefaultCacheManager(String globalConfigurationFile, String defaultConfigurationFile, String namedCacheFile,
+ boolean start) throws IOException {
+ try {
+ InfinispanConfiguration gconfiguration = InfinispanConfiguration.newInfinispanConfiguration(
+ globalConfigurationFile, InfinispanConfiguration.resolveSchemaPath(),
+ new ConfigurationValidatingVisitor());
- globalConfiguration = gconfiguration.parseGlobalConfiguration();
+ globalConfiguration = gconfiguration.parseGlobalConfiguration();
- InfinispanConfiguration dconfiguration = InfinispanConfiguration.newInfinispanConfiguration(
- defaultConfigurationFile, InfinispanConfiguration.resolveSchemaPath(),
- new ConfigurationValidatingVisitor());
+ InfinispanConfiguration dconfiguration = InfinispanConfiguration.newInfinispanConfiguration(
+ defaultConfigurationFile, InfinispanConfiguration.resolveSchemaPath(),
+ new ConfigurationValidatingVisitor());
- defaultConfiguration = dconfiguration.parseDefaultConfiguration();
+ defaultConfiguration = dconfiguration.parseDefaultConfiguration();
- if (namedCacheFile != null) {
- InfinispanConfiguration NCconfiguration = InfinispanConfiguration.newInfinispanConfiguration(
- namedCacheFile, InfinispanConfiguration.resolveSchemaPath(),
- new ConfigurationValidatingVisitor());
+ if (namedCacheFile != null) {
+ InfinispanConfiguration NCconfiguration = InfinispanConfiguration.newInfinispanConfiguration(
+ namedCacheFile, InfinispanConfiguration.resolveSchemaPath(),
+ new ConfigurationValidatingVisitor());
- for (Map.Entry<String, Configuration> entry : NCconfiguration.parseNamedConfigurations().entrySet()) {
- Configuration c = defaultConfiguration.clone();
- c.applyOverrides(entry.getValue());
- configurationOverrides.put(entry.getKey(), c);
- }
- }
+ for (Map.Entry<String, Configuration> entry : NCconfiguration.parseNamedConfigurations().entrySet()) {
+ Configuration c = defaultConfiguration.clone();
+ c.applyOverrides(entry.getValue());
+ configurationOverrides.put(entry.getKey(), c);
+ }
+ }
- globalComponentRegistry = new GlobalComponentRegistry(this.globalConfiguration, this);
+ globalComponentRegistry = new GlobalComponentRegistry(this.globalConfiguration, this);
- } catch (RuntimeException re) {
- throw new ConfigurationException(re);
- }
+ } catch (RuntimeException re) {
+ throw new ConfigurationException(re);
+ }
- if (start)
- start();
- }
+ if (start)
+ start();
+ }
- /**
- * {@inheritDoc}
- */
- public Configuration defineConfiguration(String cacheName, Configuration configurationOverride) {
- return defineConfiguration(cacheName, configurationOverride, defaultConfiguration, true);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public Configuration defineConfiguration(String cacheName, Configuration configurationOverride) {
+ return defineConfiguration(cacheName, configurationOverride, defaultConfiguration, true);
+ }
- /**
- * {@inheritDoc}
- */
- public Configuration defineConfiguration(String cacheName, String templateName, Configuration configurationOverride) {
- if (templateName != null) {
- Configuration c = configurationOverrides.get(templateName);
- if (c != null)
- return defineConfiguration(cacheName, configurationOverride, c, false);
- return defineConfiguration(cacheName, configurationOverride);
- }
- return defineConfiguration(cacheName, configurationOverride);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public Configuration defineConfiguration(String cacheName, String templateName, Configuration configurationOverride) {
+ if (templateName != null) {
+ Configuration c = configurationOverrides.get(templateName);
+ if (c != null)
+ return defineConfiguration(cacheName, configurationOverride, c, false);
+ return defineConfiguration(cacheName, configurationOverride);
+ }
+ return defineConfiguration(cacheName, configurationOverride);
+ }
- private Configuration defineConfiguration(String cacheName, Configuration configOverride,
- Configuration defaultConfigIfNotPresent, boolean checkExisting) {
- if (cacheName == null || configOverride == null)
- throw new NullPointerException("Null arguments not allowed");
- if (cacheName.equals(DEFAULT_CACHE_NAME))
- throw new IllegalArgumentException("Cache name cannot be used as it is a reserved, internal name");
- if (checkExisting) {
- Configuration existing = configurationOverrides.get(cacheName);
- if (existing != null) {
- existing.applyOverrides(configOverride);
- return existing.clone();
- }
- }
- Configuration configuration = defaultConfigIfNotPresent.clone();
- configuration.applyOverrides(configOverride.clone());
- configurationOverrides.put(cacheName, configuration);
- return configuration;
- }
+ private Configuration defineConfiguration(String cacheName, Configuration configOverride,
+ Configuration defaultConfigIfNotPresent, boolean checkExisting) {
+ if (cacheName == null || configOverride == null)
+ throw new NullPointerException("Null arguments not allowed");
+ if (cacheName.equals(DEFAULT_CACHE_NAME))
+ throw new IllegalArgumentException("Cache name cannot be used as it is a reserved, internal name");
+ if (checkExisting) {
+ Configuration existing = configurationOverrides.get(cacheName);
+ if (existing != null) {
+ existing.applyOverrides(configOverride);
+ return existing.clone();
+ }
+ }
+ Configuration configuration = defaultConfigIfNotPresent.clone();
+ configuration.applyOverrides(configOverride.clone());
+ configurationOverrides.put(cacheName, configuration);
+ return configuration;
+ }
- /**
- * Retrieves the default cache associated with this cache manager. Note that
- * the default cache does not need to be explicitly created with
- * {@link #createCache(String)} since it is automatically created lazily
- * when first used.
- * <p/>
- * As such, this method is always guaranteed to return the default cache.
- *
- * @return the default cache.
- */
- public <K, V> Cache<K, V> getCache() {
- return getCache(DEFAULT_CACHE_NAME);
- }
+ /**
+ * Retrieves the default cache associated with this cache manager. Note that the default cache does not need to be
+ * explicitly created with {@link #createCache(String)} since it is automatically created lazily when first used.
+ * <p/>
+ * As such, this method is always guaranteed to return the default cache.
+ *
+ * @return the default cache.
+ */
+ public <K, V> Cache<K, V> getCache() {
+ return getCache(DEFAULT_CACHE_NAME);
+ }
- /**
- * Retrieves a named cache from the system. If the cache has been previously
- * created with the same name, the running cache instance is returned.
- * Otherwise, this method attempts to create the cache first.
- * <p/>
- * When creating a new cache, this method will use the configuration passed
- * in to the CacheManager on construction, as a template, and then
- * optionally apply any overrides previously defined for the named cache
- * using the {@link #defineConfiguration(String, Configuration)} or
- * {@link #defineConfiguration(String, String, Configuration)} methods, or
- * declared in the configuration file.
- *
- * @param cacheName
- * name of cache to retrieve
- * @return a cache instance identified by cacheName
- */
- @SuppressWarnings("unchecked")
- public <K, V> Cache<K, V> getCache(String cacheName) {
- if (cacheName == null)
- throw new NullPointerException("Null arguments not allowed");
+ /**
+ * Retrieves a named cache from the system. If the cache has been previously created with the same name, the running
+ * cache instance is returned. Otherwise, this method attempts to create the cache first.
+ * <p/>
+ * When creating a new cache, this method will use the configuration passed in to the CacheManager on construction, as
+ * a template, and then optionally apply any overrides previously defined for the named cache using the {@link
+ * #defineConfiguration(String, Configuration)} or {@link #defineConfiguration(String, String, Configuration)} methods,
+ * or declared in the configuration file.
+ *
+ * @param cacheName name of cache to retrieve
+ * @return a cache instance identified by cacheName
+ */
+ @SuppressWarnings("unchecked")
+ public <K, V> Cache<K, V> getCache(String cacheName) {
+ if (cacheName == null)
+ throw new NullPointerException("Null arguments not allowed");
- if (caches.containsKey(cacheName))
- return caches.get(cacheName);
+ if (caches.containsKey(cacheName))
+ return caches.get(cacheName);
- return createCache(cacheName);
- }
+ return createCache(cacheName);
+ }
- public String getClusterName() {
- return globalConfiguration.getClusterName();
- }
+ public String getClusterName() {
+ return globalConfiguration.getClusterName();
+ }
- public List<Address> getMembers() {
- Transport t = globalComponentRegistry.getComponent(Transport.class);
- return t == null ? null : t.getMembers();
- }
+ public List<Address> getMembers() {
+ if (globalComponentRegistry == null) return null;
+ Transport t = globalComponentRegistry.getComponent(Transport.class);
+ return t == null ? null : t.getMembers();
+ }
- public Address getAddress() {
- Transport t = globalComponentRegistry.getComponent(Transport.class);
- return t == null ? null : t.getAddress();
- }
+ public Address getAddress() {
+ if (globalComponentRegistry == null) return null;
+ Transport t = globalComponentRegistry.getComponent(Transport.class);
+ return t == null ? null : t.getAddress();
+ }
- public boolean isCoordinator() {
- Transport t = globalComponentRegistry.getComponent(Transport.class);
- return t != null && t.isCoordinator();
- }
+ public boolean isCoordinator() {
+ if (globalComponentRegistry == null) return false;
+ Transport t = globalComponentRegistry.getComponent(Transport.class);
+ return t != null && t.isCoordinator();
+ }
- private Cache createCache(String cacheName) {
- Configuration c;
- if (cacheName.equals(DEFAULT_CACHE_NAME) || !configurationOverrides.containsKey(cacheName))
- c = defaultConfiguration.clone();
- else
- c = configurationOverrides.get(cacheName);
+ private Cache createCache(String cacheName) {
+ Configuration c;
+ if (cacheName.equals(DEFAULT_CACHE_NAME) || !configurationOverrides.containsKey(cacheName))
+ c = defaultConfiguration.clone();
+ else
+ c = configurationOverrides.get(cacheName);
- c.setGlobalConfiguration(globalConfiguration);
- c.assertValid();
- Cache cache = new InternalCacheFactory().createCache(c, globalComponentRegistry, cacheName);
- Cache other = caches.putIfAbsent(cacheName, cache);
- if (other == null) {
- cache.start();
- return cache;
- } else {
- return other;
- }
- }
+ c.setGlobalConfiguration(globalConfiguration);
+ c.assertValid();
+ Cache cache = new InternalCacheFactory().createCache(c, globalComponentRegistry, cacheName);
+ Cache other = caches.putIfAbsent(cacheName, cache);
+ if (other == null) {
+ cache.start();
+ return cache;
+ } else {
+ return other;
+ }
+ }
- public void start() {
- globalComponentRegistry.getComponent(CacheManagerJmxRegistration.class).start();
- }
+ public void start() {
+ globalComponentRegistry.getComponent(CacheManagerJmxRegistration.class).start();
+ }
- public void stop() {
- // make sure we stop the default cache LAST!
- Cache defaultCache = null;
- for (Map.Entry<String, Cache> entry : caches.entrySet()) {
- if (entry.getKey().equals(DEFAULT_CACHE_NAME)) {
- defaultCache = entry.getValue();
- } else {
- unregisterCacheMBean(entry.getValue());
- entry.getValue().stop();
- }
- }
+ public void stop() {
+ // make sure we stop the default cache LAST!
+ Cache defaultCache = null;
+ for (Map.Entry<String, Cache> entry : caches.entrySet()) {
+ if (entry.getKey().equals(DEFAULT_CACHE_NAME)) {
+ defaultCache = entry.getValue();
+ } else {
+ unregisterCacheMBean(entry.getValue());
+ entry.getValue().stop();
+ }
+ }
- if (defaultCache != null) {
- unregisterCacheMBean(defaultCache);
- defaultCache.stop();
- }
- globalComponentRegistry.getComponent(CacheManagerJmxRegistration.class).stop();
- globalComponentRegistry.stop();
- }
+ if (defaultCache != null) {
+ unregisterCacheMBean(defaultCache);
+ defaultCache.stop();
+ }
+ globalComponentRegistry.getComponent(CacheManagerJmxRegistration.class).stop();
+ globalComponentRegistry.stop();
+ }
- private void unregisterCacheMBean(Cache cache) {
- if (cache.getStatus().allowInvocations() && cache.getConfiguration().isExposeJmxStatistics()) {
- cache.getAdvancedCache().getComponentRegistry().getComponent(CacheJmxRegistration.class)
- .unregisterCacheMBean();
- }
- }
+ private void unregisterCacheMBean(Cache cache) {
+ if (cache.getStatus().allowInvocations() && cache.getConfiguration().isExposeJmxStatistics()) {
+ cache.getAdvancedCache().getComponentRegistry().getComponent(CacheJmxRegistration.class)
+ .unregisterCacheMBean();
+ }
+ }
- public void addListener(Object listener) {
- CacheManagerNotifier notifier = globalComponentRegistry.getComponent(CacheManagerNotifier.class);
- notifier.addListener(listener);
- }
+ public void addListener(Object listener) {
+ CacheManagerNotifier notifier = globalComponentRegistry.getComponent(CacheManagerNotifier.class);
+ notifier.addListener(listener);
+ }
- public void removeListener(Object listener) {
- CacheManagerNotifier notifier = globalComponentRegistry.getComponent(CacheManagerNotifier.class);
- notifier.removeListener(listener);
- }
+ public void removeListener(Object listener) {
+ CacheManagerNotifier notifier = globalComponentRegistry.getComponent(CacheManagerNotifier.class);
+ notifier.removeListener(listener);
+ }
- public Set<Object> getListeners() {
- CacheManagerNotifier notifier = globalComponentRegistry.getComponent(CacheManagerNotifier.class);
- return notifier.getListeners();
- }
+ public Set<Object> getListeners() {
+ CacheManagerNotifier notifier = globalComponentRegistry.getComponent(CacheManagerNotifier.class);
+ return notifier.getListeners();
+ }
- public ComponentStatus getStatus() {
- return globalComponentRegistry.getStatus();
- }
+ public ComponentStatus getStatus() {
+ return globalComponentRegistry.getStatus();
+ }
- public GlobalConfiguration getGlobalConfiguration() {
- return globalConfiguration;
- }
+ public GlobalConfiguration getGlobalConfiguration() {
+ return globalConfiguration;
+ }
- public Configuration getDefaultConfiguration() {
- return defaultConfiguration;
- }
+ public Configuration getDefaultConfiguration() {
+ return defaultConfiguration;
+ }
- public Set<String> getCacheNames() {
- Set<String> names = new HashSet<String>(configurationOverrides.keySet());
- names.remove(DEFAULT_CACHE_NAME);
- if (names.isEmpty())
- return Collections.emptySet();
- else
- return Immutables.immutableSetWrap(names);
- }
+ public Set<String> getCacheNames() {
+ Set<String> names = new HashSet<String>(configurationOverrides.keySet());
+ names.remove(DEFAULT_CACHE_NAME);
+ if (names.isEmpty())
+ return Collections.emptySet();
+ else
+ return Immutables.immutableSetWrap(names);
+ }
- @ManagedAttribute(description = "The status of the cache manager instance.")
- @Metric(displayName = "Cache manager status", dataType = DataType.TRAIT, displayType = DisplayType.SUMMARY)
- public String getCacheManagerStatus() {
- return getStatus().toString();
- }
+ @ManagedAttribute(description = "The status of the cache manager instance.")
+ @Metric(displayName = "Cache manager status", dataType = DataType.TRAIT, displayType = DisplayType.SUMMARY)
+ public String getCacheManagerStatus() {
+ return getStatus().toString();
+ }
- @ManagedAttribute(description = "The defined cache names and their statuses. The default cache is not included in this representation.")
- @Metric(displayName = "List of defined caches", dataType = DataType.TRAIT, displayType = DisplayType.SUMMARY)
- public String getDefinedCacheNames() {
- StringBuilder result = new StringBuilder("[");
- for (String cacheName : getCacheNames()) {
- boolean started = caches.containsKey(cacheName);
- result.append(cacheName).append(started ? "(created)" : "(not created)");
- }
- result.append("]");
- return result.toString();
- }
+ @ManagedAttribute(description = "The defined cache names and their statuses. The default cache is not included in this representation.")
+ @Metric(displayName = "List of defined caches", dataType = DataType.TRAIT, displayType = DisplayType.SUMMARY)
+ public String getDefinedCacheNames() {
+ StringBuilder result = new StringBuilder("[");
+ for (String cacheName : getCacheNames()) {
+ boolean started = caches.containsKey(cacheName);
+ result.append(cacheName).append(started ? "(created)" : "(not created)");
+ }
+ result.append("]");
+ return result.toString();
+ }
- @ManagedAttribute(description = "The total number of defined caches, excluding the default cache.")
- @Metric(displayName = "Number of caches defined", displayType = DisplayType.SUMMARY)
- public String getDefinedCacheCount() {
- return String.valueOf(this.configurationOverrides.keySet().size());
- }
+ @ManagedAttribute(description = "The total number of defined caches, excluding the default cache.")
+ @Metric(displayName = "Number of caches defined", displayType = DisplayType.SUMMARY)
+ public String getDefinedCacheCount() {
+ return String.valueOf(this.configurationOverrides.keySet().size());
+ }
- @ManagedAttribute(description = "The total number of created caches, including the default cache.")
- @Metric(displayName = "Number of caches created", displayType = DisplayType.SUMMARY)
- public String getCreatedCacheCount() {
- return String.valueOf(this.caches.keySet().size());
- }
+ @ManagedAttribute(description = "The total number of created caches, including the default cache.")
+ @Metric(displayName = "Number of caches created", displayType = DisplayType.SUMMARY)
+ public String getCreatedCacheCount() {
+ return String.valueOf(this.caches.keySet().size());
+ }
- @ManagedAttribute(description = "The total number of running caches, including the default cache.")
- @Metric(displayName = "Number of running caches", displayType = DisplayType.SUMMARY)
- public String getRunningCacheCount() {
- int running = 0;
- for (Cache cache : caches.values()) {
- if (cache.getStatus() == ComponentStatus.RUNNING)
- running++;
- }
- return String.valueOf(running);
- }
+ @ManagedAttribute(description = "The total number of running caches, including the default cache.")
+ @Metric(displayName = "Number of running caches", displayType = DisplayType.SUMMARY)
+ public String getRunningCacheCount() {
+ int running = 0;
+ for (Cache cache : caches.values()) {
+ if (cache.getStatus() == ComponentStatus.RUNNING)
+ running++;
+ }
+ return String.valueOf(running);
+ }
- @ManagedAttribute(description = "Infinispan version.")
- @Metric(displayName = "Infinispan version", displayType = DisplayType.SUMMARY, dataType = DataType.TRAIT)
- public String getVersion() {
- return Version.printVersion();
- }
+ @ManagedAttribute(description = "Infinispan version.")
+ @Metric(displayName = "Infinispan version", displayType = DisplayType.SUMMARY, dataType = DataType.TRAIT)
+ public String getVersion() {
+ return Version.printVersion();
+ }
- @ManagedAttribute(description = "The name of this cache manager")
- @Metric(displayName = "Cache manager name", displayType = DisplayType.SUMMARY, dataType = DataType.TRAIT)
- public String getName() {
- StringBuilder sb = new StringBuilder();
- sb.append(globalConfiguration.getJmxDomain()).append('@');
- String jmxPort = System.getProperty("com.sun.management.jmxremote.port");
- if (jmxPort != null) {
- try {
- // At least until jdk6, Sun bind the jmx agent to
- // 0.0.0.0:jmxPort, so using local host name is safe.
- sb.append(InetAddress.getLocalHost().getHostName()).append(':').append(jmxPort);
- } catch (UnknownHostException e) {
- if (log.isTraceEnabled())
- log.trace("Unable to resolve host", e);
- sb.append(getLogicalAddressString());
- }
- } else {
- sb.append(getLogicalAddressString());
- }
- return sb.toString();
- }
+ @ManagedAttribute(description = "The name of this cache manager")
+ @Metric(displayName = "Cache manager name", displayType = DisplayType.SUMMARY, dataType = DataType.TRAIT)
+ public String getName() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(globalConfiguration.getJmxDomain()).append('@');
+ String jmxPort = System.getProperty("com.sun.management.jmxremote.port");
+ if (jmxPort != null) {
+ try {
+ // At least until jdk6, Sun bind the jmx agent to
+ // 0.0.0.0:jmxPort, so using local host name is safe.
+ sb.append(InetAddress.getLocalHost().getHostName()).append(':').append(jmxPort);
+ } catch (UnknownHostException e) {
+ if (log.isTraceEnabled())
+ log.trace("Unable to resolve host", e);
+ sb.append(getLogicalAddressString());
+ }
+ } else {
+ sb.append(getLogicalAddressString());
+ }
+ return sb.toString();
+ }
- @ManagedOperation(description = "Starts the default cache associated with this cache manager")
- @Operation(displayName = "Starts the default cache")
- public void startCache() {
- getCache();
- }
+ @ManagedOperation(description = "Starts the default cache associated with this cache manager")
+ @Operation(displayName = "Starts the default cache")
+ public void startCache() {
+ getCache();
+ }
- @ManagedOperation(description = "Starts a named cache from this cache manager")
- @Operation(name = "startCacheWithCacheName", displayName = "Starts a cache with the given name")
- public void startCache(@Parameter(name = "cacheName", description = "Name of cache to start") String cacheName) {
- getCache(cacheName);
- }
+ @ManagedOperation(description = "Starts a named cache from this cache manager")
+ @Operation(name = "startCacheWithCacheName", displayName = "Starts a cache with the given name")
+ public void startCache(@Parameter(name = "cacheName", description = "Name of cache to start") String cacheName) {
+ getCache(cacheName);
+ }
- private String getLogicalAddressString() {
+ private String getLogicalAddressString() {
return getAddress() == null ? "local" : getAddress().toString();
}
More information about the infinispan-commits
mailing list