[jboss-cvs] JBossAS SVN: r82744 - in projects/ejb3/trunk/core: src/test/java/org/jboss/ejb3/core/test/common and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jan 9 21:27:38 EST 2009


Author: ALRubinger
Date: 2009-01-09 21:27:38 -0500 (Fri, 09 Jan 2009)
New Revision: 82744

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1150/unit/WebServiceContextInjectionTestCase.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1506/unit/DescriptorAnnotationTestCase.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java
Log:
[EJBTHREE-1672] ejb3-core to take advantage of JBossMetaData from Classes

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/pom.xml	2009-01-10 02:27:38 UTC (rev 82744)
@@ -358,7 +358,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-common</artifactId>
-      <version>1.0.0-Beta4</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -406,7 +406,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-test</artifactId>
-      <version>0.1.3</version>
+      <version>1.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java	2009-01-10 02:27:38 UTC (rev 82744)
@@ -22,9 +22,12 @@
 package org.jboss.ejb3.core.test.common;
 
 import java.net.URL;
-import java.util.ArrayList;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.List;
+import java.util.Set;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -51,6 +54,8 @@
 import org.jboss.ejb3.test.common.MetaDataHelper;
 import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossServiceBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.junit.AfterClass;
@@ -70,35 +75,37 @@
    private static final Logger log = Logger.getLogger(AbstractEJB3TestCase.class);
 
    private static final String DOMAIN_NAME_SLSB = "Stateless Bean";
-   
+
    private static final String DOMAIN_NAME_SFSB = "Stateful Bean";
-   
+
    private static final String OBJECT_STORE_NAME_PM_FACTORY_REGISTRY = "EJB3PersistenceManagerFactoryRegistry";
-   
+
    private static final String OBJECT_STORE_NAME_CACHE_FACTORY_REGISTRY = "EJB3CacheFactoryRegistry";
-   
+
    private static InitialContext initialContext;
-   
-   private static List<SessionContainer> containers = new ArrayList<SessionContainer>();
-   
+
+   private static Set<SessionContainer> allDeployedContainers = new HashSet<SessionContainer>();
+
    /**
     * Types of Containers Supported
     */
-   enum ContainerType{
-      SFSB,SLSB,SERVICE
+   enum ContainerType {
+      SFSB, SLSB, SERVICE
    }
 
    @AfterClass
    public static void afterClass() throws Exception
    {
-      for(SessionContainer container : containers)
-         unregisterContainer(container);
-      containers.clear();
-      
-      if(initialContext != null)
+      Set<SessionContainer> deployedContainers = new HashSet<SessionContainer>();
+      deployedContainers.addAll(allDeployedContainers);
+      for (SessionContainer container : deployedContainers)
+         undeployEjb(container);
+      allDeployedContainers.clear();
+
+      if (initialContext != null)
          initialContext.close();
       initialContext = null;
-      
+
       URL url = Thread.currentThread().getContextClassLoader().getResource("ejb3-interceptors-aop.xml");
       if (url != null)
          AspectXmlLoader.undeployXML(url);
@@ -106,10 +113,10 @@
       if (bootstrap != null)
          bootstrap.shutdown();
       bootstrap = null;
-      
+
       // Unbind Registrar
       Ejb3RegistrarLocator.unbindRegistrar();
-     
+
    }
 
    @BeforeClass
@@ -140,7 +147,7 @@
          throw new IllegalStateException("Can't find ejb3-interceptors-aop.xml on class loader "
                + Thread.currentThread().getContextClassLoader());
       AspectXmlLoader.deployXML(url);
-      
+
       initialContext = new InitialContext();
    }
 
@@ -165,90 +172,121 @@
          throw new IllegalArgumentException("No such domain '" + domainName + "'");
       return (Domain) domainDef.getManager();
    }
-   
+
    protected static InitialContext getInitialContext()
    {
       return initialContext;
    }
-   
+
    /**
-    * Creates and deploys a Session EJB represented by the specified implementation class
+    * Creates and deploys a Session EJB represented by the specified implementation classes
     * 
-    * @param beanImplementationClass
+    * @param beanImplementationClasses
     * @return
     */
-   public static SessionContainer deploySessionEjb(Class<?> beanImplementationClass)
+   public static Collection<SessionContainer> deploySessionEjbs(Class<?>[] beanImplementationClasses)
    {
+      // Initialize
+      Collection<SessionContainer> containers = new HashSet<SessionContainer>();
+
       // Obtain TCL
-      ClassLoader cl = Thread.currentThread().getContextClassLoader();
+      ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+      {
+         public ClassLoader run()
+         {
+            return Thread.currentThread().getContextClassLoader();
+         }
+      });
 
       /*
        * Create Metadata
        */
 
       // Create metadata
-      JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(beanImplementationClass);
+      JBossMetaData jbossMetaData = MetaDataHelper.getMetaDataFromBeanImplClasses(beanImplementationClasses);
 
-      // Ensure a Session Bean
-      assert beanMetaData.isSession() || beanMetaData.isService() : "The specified EJB must be a Session Bean or a Service Bean";
+      // Iterate through each EJB
+      for (JBossEnterpriseBeanMetaData beanMetaData : jbossMetaData.getEnterpriseBeans())
+      {
 
-      /*
-       * Determine type
-       */
+         // Ensure a Session Bean
+         assert beanMetaData.isSession() || beanMetaData.isService() : "The specified EJB must be a Session Bean or a Service Bean";
 
-      // Initialize as SLSB
-      ContainerType sessionType = ContainerType.SLSB;
+         // Cast 
+         JBossSessionBeanMetaData smd = (JBossSessionBeanMetaData) beanMetaData;
 
-      // Set as SFSB if stateful
-      if (beanMetaData.isStateful())
-      {
-         sessionType = ContainerType.SFSB;
-      }
-      else if(beanMetaData.isService())
-         sessionType = ContainerType.SERVICE;
+         /*
+          * Determine type
+          */
 
-      // Ensure jndi.properties is accessible
-      log.info("Found: " + cl.getResource("jndi.properties"));
+         // Initialize as SLSB
+         ContainerType sessionType = ContainerType.SLSB;
 
-      // Obtain properties required of container construction
-      String beanClassname = beanImplementationClass.getName();
-      String ejbName = beanImplementationClass.getSimpleName();
-      Domain domain = getDomain(sessionType.equals(ContainerType.SLSB)
-            ? AbstractEJB3TestCase.DOMAIN_NAME_SLSB
-            : AbstractEJB3TestCase.DOMAIN_NAME_SFSB);
-      Hashtable<?, ?> ctxProperties = null;
-      DeploymentUnit unit = new MockDeploymentUnit();
-      Ejb3Deployment deployment = new MockEjb3Deployment(unit, null);
-      
-      // Is SFSB, manually set a PM Factory Registry and Cache Factory
-      //TODO C'mon, here?  Much better elsewhere.
-      if (sessionType.equals(ContainerType.SFSB))
-      {
-         // Lookup Factory Registries in MC
-         PersistenceManagerFactoryRegistry registry = Ejb3RegistrarLocator.locateRegistrar().lookup(
-               AbstractEJB3TestCase.OBJECT_STORE_NAME_PM_FACTORY_REGISTRY, PersistenceManagerFactoryRegistry.class);
-         CacheFactoryRegistry cacheFactoryRegistry = Ejb3RegistrarLocator.locateRegistrar().lookup(
-               AbstractEJB3TestCase.OBJECT_STORE_NAME_CACHE_FACTORY_REGISTRY, CacheFactoryRegistry.class);
+         // Set as SFSB if stateful
+         if (smd.isStateful())
+         {
+            sessionType = ContainerType.SFSB;
+         }
+         else if (beanMetaData.isService())
+            sessionType = ContainerType.SERVICE;
 
-         // Set on the deployment
-         deployment.setPersistenceManagerFactoryRegistry(registry);
-         deployment.setCacheFactoryRegistry(cacheFactoryRegistry);
-      }
+         // Ensure jndi.properties is accessible
+         log.info("Found: " + cl.getResource("jndi.properties"));
 
-      // Create a Session Container
-      SessionContainer container = instanciateContainer(sessionType, cl, beanClassname, ejbName, domain, ctxProperties,
-            deployment, beanMetaData);
+         // Obtain properties required of container construction
+         String beanClassname = smd.getEjbClass();
+         Domain domain = getDomain(sessionType.equals(ContainerType.SLSB)
+               ? AbstractEJB3TestCase.DOMAIN_NAME_SLSB
+               : AbstractEJB3TestCase.DOMAIN_NAME_SFSB);
+         Hashtable<?, ?> ctxProperties = null;
+         DeploymentUnit unit = new MockDeploymentUnit();
+         Ejb3Deployment deployment = new MockEjb3Deployment(unit);
 
-      // Deploy and register
-      registerContainer(container);
+         // Is SFSB, manually set a PM Factory Registry and Cache Factory
+         //TODO C'mon, here?  Much better elsewhere.
+         if (sessionType.equals(ContainerType.SFSB))
+         {
+            // Lookup Factory Registries in MC
+            PersistenceManagerFactoryRegistry registry = Ejb3RegistrarLocator.locateRegistrar().lookup(
+                  AbstractEJB3TestCase.OBJECT_STORE_NAME_PM_FACTORY_REGISTRY, PersistenceManagerFactoryRegistry.class);
+            CacheFactoryRegistry cacheFactoryRegistry = Ejb3RegistrarLocator.locateRegistrar().lookup(
+                  AbstractEJB3TestCase.OBJECT_STORE_NAME_CACHE_FACTORY_REGISTRY, CacheFactoryRegistry.class);
 
-      containers.add(container);
-      
+            // Set on the deployment
+            deployment.setPersistenceManagerFactoryRegistry(registry);
+            deployment.setCacheFactoryRegistry(cacheFactoryRegistry);
+         }
+
+         // Create a Session Container
+         SessionContainer container = instanciateContainer(sessionType, cl, beanClassname, smd.getEjbName(), domain,
+               ctxProperties, deployment, smd);
+
+         // Deploy and register
+         registerContainer(container);
+         containers.add(container);
+
+      }
+
       // Return
-      return container;
+      return containers;
    }
-   
+
    /**
+    * Creates and deploys a Session EJB represented by the specified implementation class
+    * 
+    * @param beanImplementationClass
+    * @return
+    */
+   public static SessionContainer deploySessionEjb(Class<?> beanImplementationClass)
+   {
+      Collection<SessionContainer> containers = deploySessionEjbs(new Class<?>[]
+      {beanImplementationClass});
+      assert containers.size() == 1 : "Was only expected one " + SessionContainer.class.getSimpleName()
+            + " from bean impl class: " + beanImplementationClass;
+      return containers.iterator().next();
+   }
+
+   /**
     * Instanciates the appropriate SessionContainer based on the specified arguments and returns it
     *  
     * @param type
@@ -273,11 +311,12 @@
        */
       switch (type)
       {
-         case SERVICE:
+         case SERVICE :
             try
             {
                domain = getDomain("Service Bean");
-               container = new ServiceContainer(null, loader, beanClassName, ejbName, domain, ctxProperties, deployment, (JBossServiceBeanMetaData) md);
+               container = new ServiceContainer(null, loader, beanClassName, ejbName, domain, ctxProperties,
+                     deployment, (JBossServiceBeanMetaData) md);
             }
             catch (ClassNotFoundException cnfe)
             {
@@ -311,12 +350,12 @@
       // Return
       return container;
    }
-   
+
    protected static <T> T lookup(String name, Class<T> type) throws NamingException
    {
       return type.cast(getInitialContext().lookup(name));
    }
-   
+
    /**
     * Deploys, registers the specified Session Container
     * 
@@ -331,6 +370,9 @@
       container.processMetadata();
       Ejb3Registry.register(container);
 
+      // Add as one of the deployed containers here
+      allDeployedContainers.add(container);
+
       // Register the Container in ObjectStore (MC) - will also invoke lifecycle
       String containerName = container.getObjectName().getCanonicalName();
       try
@@ -355,19 +397,19 @@
       {
          bootstrap.lookup(containerName, Object.class);
       }
-      catch(RuntimeException e)
+      catch (RuntimeException e)
       {
          throw e;
       }
-      catch(Error e)
+      catch (Error e)
       {
          throw e;
       }
-      catch(Throwable t)
+      catch (Throwable t)
       {
          throw new RuntimeException(t);
       }
-      
+
       // Return
       return container;
    }
@@ -382,12 +424,15 @@
       // Igonre a null container (maybe deployment did not succeed)
       if (container == null)
          return;
+      if (!allDeployedContainers.contains(container))
+      {
+         return;
+      }
 
       unregisterContainer(container);
-      
-      containers.remove(container);
+
    }
-   
+
    private static void unregisterContainer(SessionContainer container)
    {
       // Unbind and call appropriate lifecycle events
@@ -400,5 +445,6 @@
          // Ignore
       }
       Ejb3Registry.unregister(container);
+      allDeployedContainers.remove(container);
    }
 }

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MockEjb3Deployment.java	2009-01-10 02:27:38 UTC (rev 82744)
@@ -35,6 +35,8 @@
 import org.jboss.ejb3.cache.NoPassivationCacheFactory;
 import org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory;
 import org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory;
+import org.jboss.ejb3.common.resolvers.plugins.FirstMatchEjbReferenceResolver;
+import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
 import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
 import org.jboss.ejb3.javaee.JavaEEComponent;
 import org.jboss.ejb3.pool.PoolFactory;
@@ -50,9 +52,33 @@
  */
 public class MockEjb3Deployment extends Ejb3Deployment
 {
-   public MockEjb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope)
+   public MockEjb3Deployment(DeploymentUnit unit)
    {
-      super(new AbstractDeploymentUnit(), unit, deploymentScope, null);
+      // TODO This should be replaced w/ a MockDeploymentUnit when completed, 
+      // to support nested deployments, @see ejb3-test MockDeploymentUnit
+      this(unit, new AbstractDeploymentUnit());
+   }
+
+   public MockEjb3Deployment(DeploymentUnit unit, org.jboss.deployers.structure.spi.DeploymentUnit du)
+   {
+      this(unit, du, null);
+   }
+
+   public MockEjb3Deployment(DeploymentUnit unit, org.jboss.deployers.structure.spi.DeploymentUnit du,
+         DeploymentScope scope)
+   {
+      super(du, unit, scope, null);
+
+      // Replace the scope if we haven't been given one (hacky, but there's
+      // a chicken/egg thing here as MockDeploymentScope requires the instance
+      // currently under construction, and DeploymentScope is @Deprecated anyway
+      // in favor of a pluggable resolver architecture, so this is a stop-gap
+      if (scope == null)
+      {
+         EjbReferenceResolver resolver = new FirstMatchEjbReferenceResolver();
+         this.deploymentScope = new MockDeploymentScope(this, du, resolver);
+      }
+
       PoolFactoryRegistry poolRegistry = new PoolFactoryRegistry();
       HashMap<String, Class<? extends PoolFactory>> poolFactories = new HashMap<String, Class<? extends PoolFactory>>();
       poolFactories.put("ThreadlocalPool", ThreadlocalPoolFactory.class);

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1150/unit/WebServiceContextInjectionTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1150/unit/WebServiceContextInjectionTestCase.java	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1150/unit/WebServiceContextInjectionTestCase.java	2009-01-10 02:27:38 UTC (rev 82744)
@@ -61,7 +61,7 @@
       String ejbName = beanClass.getSimpleName();
       Domain domain = getDomain("Stateless Bean");
       Hashtable<?,?> ctxProperties = null;
-      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit(), null);
+      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit());
       JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(beanClass);
       StatelessContainer container = new StatelessContainer(cl, beanClassname, ejbName, domain, ctxProperties, deployment, beanMetaData);
       
@@ -93,7 +93,7 @@
       String ejbName = beanClass.getSimpleName();
       Domain domain = getDomain("Stateless Bean");
       Hashtable<?,?> ctxProperties = null;
-      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit(), null);
+      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit());
       JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(beanClass);
       
       // add an override

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1506/unit/DescriptorAnnotationTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1506/unit/DescriptorAnnotationTestCase.java	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1506/unit/DescriptorAnnotationTestCase.java	2009-01-10 02:27:38 UTC (rev 82744)
@@ -65,7 +65,7 @@
       sessionBeanMetaData.setSessionType(SessionType.Stateful);
       enterpriseBeans.add(sessionBeanMetaData);
       
-      MockEjb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit(), null);
+      MockEjb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit());
       Ejb3DescriptorHandler handler = new Ejb3DescriptorHandler(deployment, metaData);
       List<Container> containers = handler.getContainers(deployment, new HashMap<String, Container>());
       

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java	2009-01-10 02:27:38 UTC (rev 82744)
@@ -60,7 +60,7 @@
       String ejbName = MyStatefulBean.class.getSimpleName();
       Domain domain = getDomain("Stateful Bean");
       Hashtable<?,?> ctxProperties = null;
-      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit(), null);
+      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit());
       deployment.setPersistenceManagerFactoryRegistry(getBootstrap().lookup("EJB3PersistenceManagerFactoryRegistry", PersistenceManagerFactoryRegistry.class));
       deployment.setRemoteProxyFactoryRegistry(getBootstrap().lookup("EJB3RemoteProxyFactoryRegistry", RemoteProxyFactoryRegistry.class));
       JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(MyStatefulBean.class);

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java	2009-01-10 02:27:38 UTC (rev 82744)
@@ -22,6 +22,8 @@
 package org.jboss.ejb3.test.cachepassivation;
 
 import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
@@ -58,7 +60,13 @@
     */
    public ClassLoader getClassLoader()
    {
-      return Thread.currentThread().getContextClassLoader();
+      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+      {
+         public ClassLoader run()
+         {
+            return Thread.currentThread().getContextClassLoader();
+         }
+      });
    }
 
    /* (non-Javadoc)

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java	2009-01-10 01:48:19 UTC (rev 82743)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java	2009-01-10 02:27:38 UTC (rev 82744)
@@ -84,7 +84,7 @@
       factories.put("MyStatefulSessionFilePersistenceManager", MyStatefulSessionFilePersistenceManagerFactory.class);
       PersistenceManagerFactoryRegistry persistenceManagerFactoryRegistry = new PersistenceManagerFactoryRegistry();
       persistenceManagerFactoryRegistry.setFactories(factories);
-      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit(), null);
+      Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit());
       deployment.setPersistenceManagerFactoryRegistry(persistenceManagerFactoryRegistry);
       MockStatefulContainer container = new MockStatefulContainer(cl, beanClassName, ejbName, domain, ctxProperties,
             deployment);




More information about the jboss-cvs-commits mailing list