[jboss-cvs] JBossAS SVN: r106465 - in projects/cluster/ha-server-cache-ispn/trunk: src/main/java/org/jboss/ha/infinispan and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 6 14:41:24 EDT 2010
Author: pferraro
Date: 2010-07-06 14:41:24 -0400 (Tue, 06 Jul 2010)
New Revision: 106465
Modified:
projects/cluster/ha-server-cache-ispn/trunk/pom.xml
projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactory.java
projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactoryImpl.java
projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistry.java
projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java
projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerFactoryTest.java
projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerRegistryTest.java
Log:
Upgrade Infinispan to 4.1.0.CR1. Refactor CacheManager->CacheContainer due to deprecation.
Modified: projects/cluster/ha-server-cache-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/pom.xml 2010-07-06 18:39:37 UTC (rev 106464)
+++ projects/cluster/ha-server-cache-ispn/trunk/pom.xml 2010-07-06 18:41:24 UTC (rev 106465)
@@ -32,8 +32,9 @@
<version.jboss.ha.server.cache.spi>2.2.0.Final</version.jboss.ha.server.cache.spi>
<version.jboss.ha.server.api>2.0.0.Alpha3</version.jboss.ha.server.api>
<version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
+ <version.jboss.kernel>2.2.0.Alpha10</version.jboss.kernel>
<version.jboss.logging>3.0.0.Beta2</version.jboss.logging>
- <version.infinispan>4.1.0.BETA2</version.infinispan>
+ <version.infinispan>4.1.0.CR1</version.infinispan>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
<version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
<version.org.jboss.metadata.war>2.0.0.Alpha14</version.org.jboss.metadata.war>
@@ -140,6 +141,12 @@
<version>${version.org.jboss.metadata.war}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.kernel}</version>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactory.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactory.java 2010-07-06 18:39:37 UTC (rev 106464)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactory.java 2010-07-06 18:41:24 UTC (rev 106465)
@@ -21,7 +21,7 @@
*/
package org.jboss.ha.infinispan;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.CacheContainer;
/**
* Creates an Infinispan {@link CacheManager} instance from configuration.
@@ -35,5 +35,5 @@
* @param configuration a cache manager configuration
* @return an Infinispan cache manager
*/
- CacheManager createCacheManager(CacheManagerConfiguration configuration);
+ CacheContainer createCacheManager(CacheManagerConfiguration configuration);
}
Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactoryImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactoryImpl.java 2010-07-06 18:39:37 UTC (rev 106464)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerFactoryImpl.java 2010-07-06 18:41:24 UTC (rev 106465)
@@ -25,7 +25,7 @@
import org.infinispan.config.Configuration;
import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.CacheContainer;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.remoting.transport.jgroups.JGroupsChannelLookup;
@@ -60,7 +60,7 @@
* @see org.jboss.ha.infinispan.CacheManagerFactory#createCacheManager(org.jboss.ha.infinispan.CacheManagerConfiguration)
*/
@Override
- public CacheManager createCacheManager(CacheManagerConfiguration configuration)
+ public CacheContainer createCacheManager(CacheManagerConfiguration configuration)
{
GlobalConfiguration globalConfiguration = configuration.getGlobalConfiguration();
Properties properties = globalConfiguration.getTransportProperties();
Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistry.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistry.java 2010-07-06 18:39:37 UTC (rev 106464)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistry.java 2010-07-06 18:41:24 UTC (rev 106465)
@@ -23,7 +23,7 @@
import java.util.Set;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.CacheContainer;
/**
* A registry of Infinispan cache managers.
@@ -32,13 +32,20 @@
public interface CacheManagerRegistry
{
/**
+ * Returns the default cache manager.
+ * Equivalent to getCacheManager(null).
+ * @return an Infinispan cache manager.
+ */
+ CacheContainer getDefaultCacheManager();
+
+ /**
* Returns the cache manager associated with the specified identifier,
* or the default cache manager if there is no associated cache manager
* or the specified id is null.
* @param id a cache manager identifier
* @return an Infinispan cache manager.
*/
- CacheManager getCacheManager(String id);
+ CacheContainer getCacheManager(String id);
/**
* Returns the identifiers of all cache managers in this registry.
Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java 2010-07-06 18:39:37 UTC (rev 106464)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java 2010-07-06 18:41:24 UTC (rev 106465)
@@ -31,7 +31,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.CacheContainer;
import org.jboss.beans.metadata.api.annotations.Install;
import org.jboss.beans.metadata.api.annotations.Uninstall;
import org.jboss.ha.infinispan.config.CacheManagerRegistryConfiguration;
@@ -51,9 +51,9 @@
private final CacheManagerFactory factory;
private final CacheManagerRegistryConfigurationSource source;
private final Context context;
- private final Map<String, Map.Entry<String, CacheManager>> cacheManagers = new ConcurrentHashMap<String, Map.Entry<String, CacheManager>>();
+ private final Map<String, Map.Entry<String, CacheContainer>> cacheManagers = new ConcurrentHashMap<String, Map.Entry<String, CacheContainer>>();
- private CacheManager defaultCacheManager;
+ private CacheContainer defaultCacheManager;
/**
* Creates a new CacheManagerRegistryImpl using the specified factory and source.
@@ -105,7 +105,7 @@
public void stop() throws Exception
{
- for (Map.Entry<String, CacheManager> entry: this.cacheManagers.values())
+ for (Map.Entry<String, CacheContainer> entry: this.cacheManagers.values())
{
try
{
@@ -135,12 +135,22 @@
/**
* {@inheritDoc}
+ * @see org.jboss.ha.infinispan.CacheManagerRegistry#getDefaultCacheManager()
+ */
+ @Override
+ public CacheContainer getDefaultCacheManager()
+ {
+ return this.defaultCacheManager;
+ }
+
+ /**
+ * {@inheritDoc}
* @see org.jboss.ha.infinispan.CacheManagerRegistry#getCacheManager(java.lang.String)
*/
@Override
- public CacheManager getCacheManager(String name)
+ public CacheContainer getCacheManager(String name)
{
- Map.Entry<String, CacheManager> entry = (name != null) ? this.cacheManagers.get(name) : null;
+ Map.Entry<String, CacheContainer> entry = (name != null) ? this.cacheManagers.get(name) : null;
// Return default cache manager, if name was not found or if it was null
return (entry != null) ? entry.getValue() : this.defaultCacheManager;
@@ -149,12 +159,12 @@
@Install
public void add(CacheManagerRegistryConfigurationEntry entry) throws NamingException
{
- CacheManager manager = this.factory.createCacheManager(new CacheManagerConfigurationAdapter(entry.getConfiguration()));
+ CacheContainer manager = this.factory.createCacheManager(new CacheManagerConfigurationAdapter(entry.getConfiguration()));
String jndiName = entry.getJndiName();
// Store cache managers with jndi name, so they can be unbound during stop()
- this.cacheManagers.put(entry.getId(), new AbstractMap.SimpleImmutableEntry<String, CacheManager>(jndiName, manager));
+ this.cacheManagers.put(entry.getId(), new AbstractMap.SimpleImmutableEntry<String, CacheContainer>(jndiName, manager));
// Bind cache manager to jndi
this.context.bind(jndiName, manager);
@@ -163,7 +173,7 @@
@Uninstall
public void remove(CacheManagerRegistryConfigurationEntry config) throws NamingException
{
- Map.Entry<String, CacheManager> entry = this.cacheManagers.remove(config.getId());
+ Map.Entry<String, CacheContainer> entry = this.cacheManagers.remove(config.getId());
if (entry != null)
{
Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerFactoryTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerFactoryTest.java 2010-07-06 18:39:37 UTC (rev 106464)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerFactoryTest.java 2010-07-06 18:41:24 UTC (rev 106465)
@@ -10,7 +10,7 @@
import org.infinispan.config.Configuration;
import org.infinispan.config.GlobalConfiguration;
import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.CacheContainer;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
import org.jgroups.ChannelFactory;
@@ -40,7 +40,7 @@
EasyMock.replay(configuration, channelFactory);
- CacheManager result = factory.createCacheManager(configuration);
+ CacheContainer result = factory.createCacheManager(configuration);
try
{
Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerRegistryTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerRegistryTest.java 2010-07-06 18:39:37 UTC (rev 106464)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/infinispan/CacheManagerRegistryTest.java 2010-07-06 18:41:24 UTC (rev 106465)
@@ -15,7 +15,7 @@
import org.easymock.EasyMock;
import org.infinispan.config.Configuration;
import org.infinispan.config.InfinispanConfiguration;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.CacheContainer;
import org.jboss.ha.infinispan.config.CacheManagerRegistryConfiguration;
import org.jboss.ha.infinispan.config.CacheManagerRegistryConfigurationEntry;
import org.jboss.ha.infinispan.config.CacheManagerRegistryConfigurationSource;
@@ -32,8 +32,8 @@
{
CacheManagerFactory factory = EasyMock.createStrictMock(CacheManagerFactory.class);
CacheManagerRegistryConfigurationSource source = EasyMock.createStrictMock(CacheManagerRegistryConfigurationSource.class);
- CacheManager defaultCacheManager = EasyMock.createStrictMock(CacheManager.class);
- CacheManager otherCacheManager = EasyMock.createStrictMock(CacheManager.class);
+ CacheContainer defaultCacheManager = EasyMock.createStrictMock(CacheContainer.class);
+ CacheContainer otherCacheManager = EasyMock.createStrictMock(CacheContainer.class);
Context context = EasyMock.createStrictMock(Context.class);
Capture<CacheManagerConfiguration> capturedConfiguration = new Capture<CacheManagerConfiguration>(CaptureType.ALL);
@@ -110,8 +110,8 @@
{
CacheManagerFactory factory = EasyMock.createStrictMock(CacheManagerFactory.class);
CacheManagerRegistryConfigurationSource provider = EasyMock.createStrictMock(CacheManagerRegistryConfigurationSource.class);
- CacheManager defaultCacheManager = EasyMock.createStrictMock(CacheManager.class);
- CacheManager otherCacheManager = EasyMock.createStrictMock(CacheManager.class);
+ CacheContainer defaultCacheManager = EasyMock.createStrictMock(CacheContainer.class);
+ CacheContainer otherCacheManager = EasyMock.createStrictMock(CacheContainer.class);
Context context = EasyMock.createStrictMock(Context.class);
Capture<CacheManagerConfiguration> capturedConfiguration = new Capture<CacheManagerConfiguration>(CaptureType.ALL);
More information about the jboss-cvs-commits
mailing list