[jboss-cvs] JBossAS SVN: r67175 - in trunk/ejb3/src: main/org/jboss/ejb3/cache and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 16 10:44:45 EST 2007
Author: ALRubinger
Date: 2007-11-16 10:44:45 -0500 (Fri, 16 Nov 2007)
New Revision: 67175
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactoryRegistry.java
trunk/ejb3/src/main/org/jboss/ejb3/pool/StrictMaxPoolFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/pool/ThreadlocalPoolFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java
Log:
[EJBTHREE-1114] Further cleaned up improper generics in Pool and Cache Factory/Registry Constructs
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -805,8 +805,8 @@
int maxSize = poolAnnotation.maxSize();
long timeout = poolAnnotation.timeout();
Ejb3Deployer deployer = deployment.getDeployer();
- PoolFactoryRegistry<? extends PoolFactory<? extends Pool>> registry = deployer.getPoolFactoryRegistry();
- PoolFactory<? extends Pool> factory = registry.getPoolFactory(registeredPoolName);
+ PoolFactoryRegistry registry = deployer.getPoolFactoryRegistry();
+ PoolFactory factory = registry.getPoolFactory(registeredPoolName);
pool = factory.createPool();
pool.initialize(this, maxSize, timeout);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -48,8 +48,6 @@
import org.hibernate.ejb.packaging.PersistenceMetadata;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
-import org.jboss.ejb3.cache.Ejb3CacheFactory;
-import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.deployers.Ejb3Deployer;
import org.jboss.ejb3.enc.EjbModuleEjbResolver;
import org.jboss.ejb3.enc.EjbModulePersistenceUnitResolver;
@@ -75,27 +73,35 @@
public abstract class Ejb3Deployment implements JavaEEModule
{
private static final Logger log = Logger.getLogger(Ejb3Deployment.class);
+
public static final String ACTUAL_ENTITY_MANAGER_FACTORY_CONTEXT = "java:/ActualEntityManagerFactories";
+
public static final String MANAGED_ENTITY_FACTORY_CONTEXT = "java:/managedEntityFactories";
private JBossMetaData metaData;
-
+
protected DeploymentUnit unit;
-
+
protected Ejb3Deployer deployer;
protected LinkedHashMap<ObjectName, Container> ejbContainers = new LinkedHashMap<ObjectName, Container>();
protected boolean hasEntities;
+
protected List<String> explicitEntityClasses = new ArrayList<String>();
protected List<PersistenceUnitDeployment> persistenceUnitDeployments = new ArrayList<PersistenceUnitDeployment>();;
protected String defaultSLSBDomain = "Stateless Bean";
+
protected String defaultSFSBDomain = "Stateful Bean";
+
protected String defaultMDBDomain = "Message Driven Bean";
+
protected String defaultConsumerDomain = "Consumer Bean";
+
protected String defaultServiceDomain = "Service Bean";
+
protected InitialContext initialContext;
protected KernelAbstraction kernelAbstraction;
@@ -104,17 +110,21 @@
protected MBeanServer mbeanServer;
protected DeploymentScope deploymentScope;
+
protected EjbModuleEjbResolver ejbRefResolver;
+
protected EjbModulePersistenceUnitResolver persistenceUnitResolver;
+
protected MessageDestinationResolver messageDestinationResolver;
//The JACC PolicyConfiguration
PolicyConfiguration pc;
- public Ejb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope, JBossMetaData metaData, Ejb3Deployer deployer)
+ public Ejb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope, JBossMetaData metaData,
+ Ejb3Deployer deployer)
{
assert unit != null : "unit is null";
-
+
this.unit = unit;
this.deployer = deployer;
this.deploymentScope = deploymentScope;
@@ -128,9 +138,10 @@
throw new RuntimeException(e);
}
ejbRefResolver = new EjbModuleEjbResolver(deploymentScope, unit.getShortName(), ejbContainers, this);
- persistenceUnitResolver = new EjbModulePersistenceUnitResolver(persistenceUnitDeployments, deploymentScope, ejbContainers);
+ persistenceUnitResolver = new EjbModulePersistenceUnitResolver(persistenceUnitDeployments, deploymentScope,
+ ejbContainers);
MessageDestinationsMetaData destinations = null;
- if(metaData != null && metaData.getAssemblyDescriptor() != null)
+ if (metaData != null && metaData.getAssemblyDescriptor() != null)
destinations = metaData.getAssemblyDescriptor().getMessageDestinations();
messageDestinationResolver = new MessageDestinationResolver(deploymentScope, destinations);
}
@@ -169,13 +180,13 @@
{
return defaultSLSBDomain;
}
-
+
public Ejb3Deployer getDeployer()
{
return this.deployer;
}
-
- public CacheFactoryRegistry<? extends Ejb3CacheFactory<? extends StatefulCache>> getCacheFactoryRegistry()
+
+ public CacheFactoryRegistry getCacheFactoryRegistry()
{
return this.getDeployer().getCacheFactoryRegistry();
}
@@ -262,7 +273,7 @@
public Container getContainer(ObjectName name)
{
- return (Container)ejbContainers.get(name);
+ return (Container) ejbContainers.get(name);
}
public java.util.Map getEjbContainers()
@@ -344,22 +355,22 @@
try
{
long start = System.currentTimeMillis();
-
+
pc = createPolicyConfiguration();
-
+
deploy();
-
+
initializePersistenceUnits();
-
+
log.debug("EJB3 deployment time took: " + (System.currentTimeMillis() - start));
}
- catch(Exception e)
+ catch (Exception e)
{
try
{
destroy();
}
- catch(Exception ignored)
+ catch (Exception ignored)
{
// ignore
}
@@ -375,13 +386,13 @@
for (Object o : ejbContainers.values())
{
- Container con = (Container)o;
+ Container con = (Container) o;
processEJBContainerMetadata(con);
}
for (Object o : ejbContainers.values())
{
- Container con = (Container)o;
+ Container con = (Container) o;
registerEJBContainer(con);
}
@@ -483,7 +494,7 @@
// EJBContainer has finished with all metadata initialization from XML files and such.
// this is really a hook to do some processing after XML has been set up and before
// and processing of dependencies and such.
- ((EJBContainer)con).instantiated();
+ ((EJBContainer) con).instantiated();
this.ejbContainers.put(con.getObjectName(), con);
Ejb3Registry.register(con);
}
@@ -505,13 +516,14 @@
// and processing of dependencies and such.
try
{
- ((EJBContainer)con).instantiated();
+ ((EJBContainer) con).instantiated();
this.ejbContainers.put(con.getObjectName(), con);
Ejb3Registry.register(con);
}
catch (Throwable t)
{
- throw new DeploymentException("Error creating ejb container " + con.getEjbName() + ": " + t.getMessage(), t);
+ throw new DeploymentException(
+ "Error creating ejb container " + con.getEjbName() + ": " + t.getMessage(), t);
}
}
}
@@ -540,13 +552,13 @@
// scope the unitName if this is an ejb archive
// todo revert to this: List<PersistenceMetadata> persistenceMetadata = PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap(), new EJB3DTDEntityResolver());
- List<PersistenceMetadata> persistenceMetadata = PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap(), new EJB3DTDEntityResolver(),
- PersistenceUnitTransactionType.JTA);
+ List<PersistenceMetadata> persistenceMetadata = PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap(),
+ new EJB3DTDEntityResolver(), PersistenceUnitTransactionType.JTA);
for (PersistenceMetadata metadata : persistenceMetadata)
{
String earShortName = deploymentScope == null ? null : deploymentScope.getShortName();
boolean isScoped = ejbContainers.size() > 0;
-
+
// Ensure 2nd level cache entries are segregated from other deployments
String cache_prefix = metadata.getProps().getProperty(SecondLevelCacheUtil.HIBERNATE_CACHE_REGION_PREFIX);
if (cache_prefix == null)
@@ -557,8 +569,8 @@
cache_prefix = SecondLevelCacheUtil.createCacheRegionPrefix(earShortName, jarName, metadata.getName());
metadata.getProps().setProperty(SecondLevelCacheUtil.HIBERNATE_CACHE_REGION_PREFIX, cache_prefix);
}
- PersistenceUnitDeployment deployment = new PersistenceUnitDeployment(initialContext, this, explicitEntityClasses, persistenceXmlUrl, metadata, earShortName,
- unit.getShortName(), isScoped);
+ PersistenceUnitDeployment deployment = new PersistenceUnitDeployment(initialContext, this,
+ explicitEntityClasses, persistenceXmlUrl, metadata, earShortName, unit.getShortName(), isScoped);
PersistenceUnitRegistry.register(deployment);
persistenceUnitDeployments.add(deployment);
}
@@ -638,73 +650,73 @@
Ejb3Registry.unregister(container);
}
}
-
-// /**
-// * Get the jndi name of a message destination.
-// *
-// * @param name the name of the message destination
-// * @return the jndi name
-// */
-// private String getMessageDestination(String name)
-// {
-// EjbJarDD dd;
-// // FIXME: Why isn't dd stored somewhere?
-// try
-// {
-// dd = EjbJarDDObjectFactory.parse(getDeploymentUnit().getEjbJarXml());
-// dd = JBossDDObjectFactory.parse(getDeploymentUnit().getJbossXml(), dd);
-// }
-// catch(IOException e)
-// {
-// throw new RuntimeException(e);
-// }
-// catch(JBossXBException e)
-// {
-// throw new RuntimeException(e);
-// }
-//
-// AssemblyDescriptor ad = dd.getAssemblyDescriptor();
-// if(ad == null)
-// throw new IllegalStateException("No assembly descriptor found in '" + getName() + "'");
-// MessageDestination md = ad.findMessageDestination(name);
-// if(md == null)
-// throw new IllegalStateException("No message destination '" + name + "' found in '" + getName() + "'");
-// String jndiName = md.getJndiName();
-// if(jndiName == null)
-// throw new IllegalStateException("No jndi name specified for message destination '" + name + "' in '" + getName() + "'");
-// return jndiName;
-// }
-
+
+ // /**
+ // * Get the jndi name of a message destination.
+ // *
+ // * @param name the name of the message destination
+ // * @return the jndi name
+ // */
+ // private String getMessageDestination(String name)
+ // {
+ // EjbJarDD dd;
+ // // FIXME: Why isn't dd stored somewhere?
+ // try
+ // {
+ // dd = EjbJarDDObjectFactory.parse(getDeploymentUnit().getEjbJarXml());
+ // dd = JBossDDObjectFactory.parse(getDeploymentUnit().getJbossXml(), dd);
+ // }
+ // catch(IOException e)
+ // {
+ // throw new RuntimeException(e);
+ // }
+ // catch(JBossXBException e)
+ // {
+ // throw new RuntimeException(e);
+ // }
+ //
+ // AssemblyDescriptor ad = dd.getAssemblyDescriptor();
+ // if(ad == null)
+ // throw new IllegalStateException("No assembly descriptor found in '" + getName() + "'");
+ // MessageDestination md = ad.findMessageDestination(name);
+ // if(md == null)
+ // throw new IllegalStateException("No message destination '" + name + "' found in '" + getName() + "'");
+ // String jndiName = md.getJndiName();
+ // if(jndiName == null)
+ // throw new IllegalStateException("No jndi name specified for message destination '" + name + "' in '" + getName() + "'");
+ // return jndiName;
+ // }
+
public String resolveMessageDestination(String link)
{
-// // FIXME: this is a copy of DeploymentEjbResolver
-// int hashIndex = link.indexOf('#');
-// if (hashIndex != -1)
-// {
-// if (deploymentScope == null)
-// {
-// log.warn("ejb link '" + link + "' is relative, but no deployment scope found");
-// return null;
-// }
-// String relativePath = link.substring(0, hashIndex);
-// Ejb3Deployment dep = deploymentScope.findRelativeDeployment(relativePath);
-// if (dep == null)
-// {
-// log.warn("can't find a deployment for path '" + relativePath + "' of ejb link '" + link + "'");
-// return null;
-// }
-// String name = link.substring(hashIndex + 1);
-// return dep.getMessageDestination(name);
-// }
-// return getMessageDestination(link);
+ // // FIXME: this is a copy of DeploymentEjbResolver
+ // int hashIndex = link.indexOf('#');
+ // if (hashIndex != -1)
+ // {
+ // if (deploymentScope == null)
+ // {
+ // log.warn("ejb link '" + link + "' is relative, but no deployment scope found");
+ // return null;
+ // }
+ // String relativePath = link.substring(0, hashIndex);
+ // Ejb3Deployment dep = deploymentScope.findRelativeDeployment(relativePath);
+ // if (dep == null)
+ // {
+ // log.warn("can't find a deployment for path '" + relativePath + "' of ejb link '" + link + "'");
+ // return null;
+ // }
+ // String name = link.substring(hashIndex + 1);
+ // return dep.getMessageDestination(name);
+ // }
+ // return getMessageDestination(link);
return messageDestinationResolver.resolveMessageDestination(link);
}
-
+
public MessageDestinationResolver getMessageDestinationResolver()
{
return messageDestinationResolver;
}
-
+
/**
* Get the meta data associated with this deployment or null if none.
*
@@ -714,7 +726,7 @@
{
return metaData;
}
-
+
public String getName()
{
return unit.getShortName();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -21,46 +21,43 @@
*/
package org.jboss.ejb3.cache;
-import java.util.HashMap;
import java.util.Map;
-import org.jboss.cache.CacheFactory;
-
/**
* Registry for all configured Stateful Cache Factory implementations
*
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class CacheFactoryRegistry<T extends Ejb3CacheFactory<? extends StatefulCache>>
+public class CacheFactoryRegistry
{
// Instance Members
- private Map<String, Class<? extends T>> factories;
+ private Map<String, Class<? extends Ejb3CacheFactory>> factories;
// Accessors / Mutators
-
- public Map<String, Class<? extends T>> getFactories()
+
+ public Map<String, Class<? extends Ejb3CacheFactory>> getFactories()
{
return factories;
}
- public void setFactories(Map<String, Class<? extends T>> factories)
+ public void setFactories(Map<String, Class<? extends Ejb3CacheFactory>> factories)
{
this.factories = factories;
}
// Functional Methods
-
+
/**
* Obtains the Cache Factory with the specified registered name
*
* @param name The registered name of the cache factory to retrieve
* @return The Cache Factory
*/
- public T getCacheFactory(String name) throws CacheFactoryNotRegisteredException
+ public Ejb3CacheFactory getCacheFactory(String name) throws CacheFactoryNotRegisteredException
{
// Obtain cache factory
- Class<? extends T> cacheFactory = this.factories.get(name);
+ Class<? extends Ejb3CacheFactory> cacheFactory = this.factories.get(name);
// Ensure registered
if (cacheFactory == null)
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -27,7 +27,7 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public interface Ejb3CacheFactory<T extends StatefulCache>
+public interface Ejb3CacheFactory
{
- T createCache();
+ StatefulCache createCache();
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -27,9 +27,8 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class NoPassivationCacheFactory implements Ejb3CacheFactory<StatefulCache>
+public class NoPassivationCacheFactory implements Ejb3CacheFactory
{
-
public StatefulCache createCache()
{
return new NoPassivationCache();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -30,9 +30,8 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class SimpleStatefulCacheFactory implements Ejb3CacheFactory<StatefulCache>
+public class SimpleStatefulCacheFactory implements Ejb3CacheFactory
{
-
public StatefulCache createCache()
{
return new SimpleStatefulCache();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -30,9 +30,8 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class StatefulTreeCacheFactory implements Ejb3CacheFactory<StatefulCache>
+public class StatefulTreeCacheFactory implements Ejb3CacheFactory
{
-
public StatefulCache createCache()
{
return new StatefulTreeCache();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -33,10 +33,6 @@
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
-import org.jboss.ejb3.cache.Ejb3CacheFactory;
-import org.jboss.ejb3.cache.StatefulCache;
-import org.jboss.ejb3.pool.Pool;
-import org.jboss.ejb3.pool.PoolFactory;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
import org.jboss.kernel.Kernel;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
@@ -64,9 +60,9 @@
private MBeanServer mbeanServer;
- private CacheFactoryRegistry<? extends Ejb3CacheFactory<? extends StatefulCache>> cacheFactoryRegistry;
+ private CacheFactoryRegistry cacheFactoryRegistry;
- private PoolFactoryRegistry<? extends PoolFactory<? extends Pool>> poolFactoryRegistry;
+ private PoolFactoryRegistry poolFactoryRegistry;
public Ejb3Deployer()
{
@@ -157,22 +153,22 @@
return allowedSuffixes;
}
- public CacheFactoryRegistry<? extends Ejb3CacheFactory<? extends StatefulCache>> getCacheFactoryRegistry()
+ public CacheFactoryRegistry getCacheFactoryRegistry()
{
return cacheFactoryRegistry;
}
- public void setCacheFactoryRegistry(CacheFactoryRegistry<? extends Ejb3CacheFactory<? extends StatefulCache>> cacheFactoryRegistry)
+ public void setCacheFactoryRegistry(CacheFactoryRegistry cacheFactoryRegistry)
{
this.cacheFactoryRegistry = cacheFactoryRegistry;
}
- public PoolFactoryRegistry<? extends PoolFactory<? extends Pool>> getPoolFactoryRegistry()
+ public PoolFactoryRegistry getPoolFactoryRegistry()
{
return poolFactoryRegistry;
}
- public void setPoolFactoryRegistry(PoolFactoryRegistry<? extends PoolFactory<? extends Pool>> poolFactoryRegistry)
+ public void setPoolFactoryRegistry(PoolFactoryRegistry poolFactoryRegistry)
{
this.poolFactoryRegistry = poolFactoryRegistry;
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactory.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactory.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -27,7 +27,7 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public interface PoolFactory<T extends Pool>
+public interface PoolFactory
{
- T createPool();
+ Pool createPool();
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactoryRegistry.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactoryRegistry.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/pool/PoolFactoryRegistry.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -23,26 +23,25 @@
import java.util.Map;
-
/**
* Registry for all configured Pool Factory implementations
*
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class PoolFactoryRegistry<T extends PoolFactory<? extends Pool>>
+public class PoolFactoryRegistry
{
// Instance Members
- private Map<String, Class<? extends T>> factories;
+ private Map<String, Class<? extends PoolFactory>> factories;
// Accessors / Mutators
- public Map<String, Class<? extends T>> getFactories()
+ public Map<String, Class<? extends PoolFactory>> getFactories()
{
return factories;
}
- public void setFactories(Map<String, Class<? extends T>> factories)
+ public void setFactories(Map<String, Class<? extends PoolFactory>> factories)
{
this.factories = factories;
}
@@ -55,10 +54,10 @@
* @param name The registered name of the pool factory to retrieve
* @return The Pool Factory
*/
- public T getPoolFactory(String name) throws PoolFactoryNotRegisteredException
+ public PoolFactory getPoolFactory(String name) throws PoolFactoryNotRegisteredException
{
// Obtain cache factory
- Class<? extends T> poolFactory = this.factories.get(name);
+ Class<? extends PoolFactory> poolFactory = this.factories.get(name);
// Ensure registered
if (poolFactory == null)
Modified: trunk/ejb3/src/main/org/jboss/ejb3/pool/StrictMaxPoolFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/pool/StrictMaxPoolFactory.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/pool/StrictMaxPoolFactory.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -27,7 +27,7 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class StrictMaxPoolFactory implements PoolFactory<Pool>
+public class StrictMaxPoolFactory implements PoolFactory
{
public Pool createPool()
Modified: trunk/ejb3/src/main/org/jboss/ejb3/pool/ThreadlocalPoolFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/pool/ThreadlocalPoolFactory.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/pool/ThreadlocalPoolFactory.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -27,7 +27,7 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class ThreadlocalPoolFactory implements PoolFactory<Pool>
+public class ThreadlocalPoolFactory implements PoolFactory
{
public Pool createPool()
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -51,7 +51,6 @@
import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aop.util.MethodHashing;
import org.jboss.aspects.asynch.FutureHolder;
-import org.jboss.cache.CacheFactory;
import org.jboss.ejb3.BeanContext;
import org.jboss.ejb3.EJBContainerInvocation;
import org.jboss.ejb3.Ejb3Deployment;
@@ -140,8 +139,8 @@
{
super.start();
Cache cacheConfig = getAnnotation(Cache.class);
- CacheFactoryRegistry<? extends Ejb3CacheFactory<? extends StatefulCache>> registry = getCacheFactoryRegistry();
- Ejb3CacheFactory<? extends StatefulCache> factory = registry.getCacheFactory(cacheConfig.value());
+ CacheFactoryRegistry registry = getCacheFactoryRegistry();
+ Ejb3CacheFactory factory = registry.getCacheFactory(cacheConfig.value());
cache = factory.createCache();
cache.initialize(this);
cache.start();
@@ -172,7 +171,7 @@
return cache;
}
- public CacheFactoryRegistry<? extends Ejb3CacheFactory<? extends StatefulCache>> getCacheFactoryRegistry()
+ public CacheFactoryRegistry getCacheFactoryRegistry()
{
return this.getDeployment().getCacheFactoryRegistry();
}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java 2007-11-16 15:06:22 UTC (rev 67174)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java 2007-11-16 15:44:45 UTC (rev 67175)
@@ -31,15 +31,12 @@
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
import org.jboss.ejb3.cache.Ejb3CacheFactory;
-import org.jboss.ejb3.cache.NoPassivationCache;
import org.jboss.ejb3.cache.NoPassivationCacheFactory;
-import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory;
import org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory;
import org.jboss.ejb3.deployers.Ejb3Deployer;
import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
import org.jboss.ejb3.javaee.JavaEEComponent;
-import org.jboss.ejb3.pool.Pool;
import org.jboss.ejb3.pool.PoolFactory;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
import org.jboss.ejb3.pool.StrictMaxPoolFactory;
@@ -58,14 +55,14 @@
public MockEjb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope)
{
super(unit, deploymentScope, null, null);
- PoolFactoryRegistry<PoolFactory<? extends Pool>> poolRegistry = new PoolFactoryRegistry<PoolFactory<? extends Pool>>();
- HashMap<String, Class<? extends PoolFactory<? extends Pool>>> poolFactories = new HashMap<String, Class<? extends PoolFactory<? extends Pool>>>();
+ PoolFactoryRegistry poolRegistry = new PoolFactoryRegistry();
+ HashMap<String, Class<? extends PoolFactory>> poolFactories = new HashMap<String, Class<? extends PoolFactory>>();
poolFactories.put("ThreadlocalPool", ThreadlocalPoolFactory.class);
poolFactories.put("StrictMaxPool", StrictMaxPoolFactory.class);
poolRegistry.setFactories(poolFactories);
deployer.setPoolFactoryRegistry(poolRegistry);
- CacheFactoryRegistry<Ejb3CacheFactory<? extends StatefulCache>> cacheRegistry = new CacheFactoryRegistry<Ejb3CacheFactory<? extends StatefulCache>>();
- HashMap<String, Class<? extends Ejb3CacheFactory<? extends StatefulCache>>> cacheFactories = new HashMap<String, Class<? extends Ejb3CacheFactory<? extends StatefulCache>>>();
+ CacheFactoryRegistry cacheRegistry = new CacheFactoryRegistry();
+ HashMap<String, Class<? extends Ejb3CacheFactory>> cacheFactories = new HashMap<String, Class<? extends Ejb3CacheFactory>>();
cacheFactories.put("NoPassivationCache", NoPassivationCacheFactory.class);
cacheFactories.put("SimpleStatefulCache", SimpleStatefulCacheFactory.class);
cacheFactories.put("StatefulTreeCache", StatefulTreeCacheFactory.class);
More information about the jboss-cvs-commits
mailing list