User: oberg   
  Date: 00/12/07 07:44:14

  Modified:    src/main/org/jboss/ejb Application.java AutoDeployer.java
                        AutoDeployerMBean.java CacheKey.java Container.java
                        ContainerFactory.java ContainerFactoryMBean.java
                        ContainerInvoker.java
                        ContainerInvokerContainer.java ContainerPlugin.java
                        DeploymentException.java EJBClassLoader.java
                        EnterpriseContext.java EntityContainer.java
                        EntityEnterpriseContext.java
                        EntityInstanceCache.java
                        EntityPersistenceManager.java
                        EntityPersistenceStore.java InstanceCache.java
                        InstancePool.java InstancePoolContainer.java
                        Interceptor.java MethodInvocation.java
                        StatefulSessionContainer.java
                        StatefulSessionEnterpriseContext.java
                        StatefulSessionPersistenceManager.java
                        StatelessSessionContainer.java
                        StatelessSessionEnterpriseContext.java
  Log:
  Changed configuration scheme (lots of changes to jboss.conf, jboss.jcml, 
org.jboss.Main)
  Added ServiceControl
  Changed jBoss -> JBoss
  Changed GPL -> LGPL
  Added jaxp/parser
  Updated services to have default constructors
  
  Revision  Changes    Path
  1.7       +3 -3      jboss/src/main/org/jboss/ejb/Application.java
  
  Index: Application.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/Application.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Application.java  2000/08/12 00:40:44     1.6
  +++ Application.java  2000/12/07 15:44:08     1.7
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -20,7 +20,7 @@
    *   @see Container
    *   @see ContainerFactory
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.6 $
  + *   @version $Revision: 1.7 $
    */
   public class Application
        implements Service
  
  
  
  1.11      +113 -87   jboss/src/main/org/jboss/ejb/AutoDeployer.java
  
  Index: AutoDeployer.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/AutoDeployer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AutoDeployer.java 2000/11/10 23:33:29     1.10
  +++ AutoDeployer.java 2000/12/07 15:44:08     1.11
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -40,7 +40,7 @@
    *
    *   @see ContainerFactory
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.10 $
  + *   @version $Revision: 1.11 $
    */
   public class AutoDeployer
        extends ServiceMBeanSupport
  @@ -54,7 +54,7 @@
      MBeanServer server;
   
        // in case more then one J2eeDeployers are available
  -     String namedDeployer;
  +     String namedDeployer = "";
   
        // JMX name of the ContainerFactory
      ObjectName factoryName;
  @@ -70,95 +70,48 @@
   
        // These URL's are being watched
      ArrayList watchedURLs = new ArrayList();
  +   
  +   // URL list
  +   String urlList = "";
   
      // Static --------------------------------------------------------
   
      // Constructors --------------------------------------------------
  +   public AutoDeployer()
  +   {
  +      this("");
  +   }
  +   
      public AutoDeployer(String urlList)
      {
  -        this ("", urlList);
  +        this ("Default", urlList);
      }
        
   
      public AutoDeployer(String _namedDeployer, String urlList)
      {
  -        namedDeployer = _namedDeployer.equals("") ? "" : " "+_namedDeployer;
  -        log = new Log (getName());
  -        addURLs(urlList);
  +        setDeployer(_namedDeployer);
  +        setURLs(urlList);
      }
   
  -     public void addURLs(String urlList)
  +     public void setURLs(String urlList)
        {
  -      StringTokenizer urls = new StringTokenizer(urlList, ",");
  -
  -             // Add URLs to list
  -      while (urls.hasMoreTokens())
  -      {
  -         String url = urls.nextToken();
  -
  -         // Check if directory
  -         File urlFile = new File(url.startsWith ("file:") ? url.substring (5) : 
url);
  -         if (urlFile.exists() && urlFile.isDirectory())
  -         {
  -            File metaFile = new File(urlFile, 
"META-INF"+File.separator+"ejb-jar.xml");
  -            if (metaFile.exists()) // It's unpackaged
  -            {
  -               try
  -               {
  -                  watchedURLs.add(new 
Deployment(urlFile.getCanonicalFile().toURL()));
  -                  log.log("Auto-deploying "+urlFile.getCanonicalFile());
  -               } catch (Exception e)
  -               {
  -                  log.warning("Cannot auto-deploy "+urlFile);
  -               }
  -            } else
  -            {
  -                                     // This is a directory whose contents shall be 
checked for deployments
  -               try
  -               {
  -                  watchedDirectories.add(urlFile.getCanonicalFile());
  -                  log.log("Watching "+urlFile.getCanonicalFile());
  -               } catch (IOException e)
  -               {
  -                  log.warning(e.toString());
  -               }
  -            }
  -         } else if (urlFile.exists()) // It's a file
  -         {
  -               // Check if it's a JAR or zip
  -               if (!(url.endsWith(".jar") ||
  -                     url.endsWith(".ear") ||
  -                     url.endsWith(".war") ||
  -                     url.endsWith(".zip")))
  -                  continue; // Was not a JAR or zip - skip it...
  -
  -               try
  -               {
  -                  watchedURLs.add(new 
Deployment(urlFile.getCanonicalFile().toURL()));
  -                  log.log("Auto-deploying "+urlFile.getCanonicalFile());
  -               } catch (Exception e)
  -               {
  -                  log.warning("Cannot auto-deploy "+urlFile);
  -               }
  -         } else // It's a real URL (probably http:)
  -         {
  -            // Check if it's a JAR or zip
  -            if (!(url.endsWith(".jar") ||
  -                  url.endsWith(".ear") ||
  -                  url.endsWith(".war") ||
  -                  url.endsWith(".zip")))
  -               continue; // Was not a JAR or zip - skip it...
  -
  -            try
  -            {
  -               watchedURLs.add(new Deployment(new URL(url)));
  -            } catch (MalformedURLException e)
  -            {
  -               // Didn't work
  -               log.warning("Cannot auto-deploy "+url);
  -            }
  -         }
  -      }
  +      this.urlList = urlList;
  +   }
  +   
  +   public String getURLs()
  +   {
  +      return urlList;
  +   }
  +   
  +   public void setDeployer(String deployer)
  +   {
  +      this.namedDeployer = deployer;
  +   }
  +   
  +   public String getDeployer()
  +   {
  +      return namedDeployer;
      }
   
      // Public --------------------------------------------------------
  @@ -288,7 +241,7 @@
      // ServiceMBeanSupport overrides ---------------------------------
      public String getName()
      {
  -      return "Auto deploy"+namedDeployer;
  +      return "Auto deploy";
      }
   
      protected ObjectName getObjectName(MBeanServer server, ObjectName name)
  @@ -298,16 +251,84 @@
         return new ObjectName(OBJECT_NAME+namedDeployer);
      }
   
  -   protected void initService()
  -      throws Exception
  -   {
  -      // Save JMX name of ContainerFactory
  -      factoryName = new ObjectName(J2eeDeployerMBean.OBJECT_NAME + namedDeployer);
  -   }
  -
      protected void startService()
         throws Exception
      {
  +      // Save JMX name of EJB ContainerFactory
  +      factoryName = new ObjectName(namedDeployer);
  +      
  +      StringTokenizer urls = new StringTokenizer(urlList, ",");
  +
  +      // Add URLs to list
  +      while (urls.hasMoreTokens())
  +      {
  +         String url = urls.nextToken();
  +
  +         // Check if directory
  +         File urlFile = new File(url.startsWith ("file:") ? url.substring (5) : 
url);
  +         if (urlFile.exists() && urlFile.isDirectory())
  +         {
  +            File metaFile = new File(urlFile, 
"META-INF"+File.separator+"ejb-jar.xml");
  +            if (metaFile.exists()) // It's unpackaged
  +            {
  +               try
  +               {
  +                  watchedURLs.add(new 
Deployment(urlFile.getCanonicalFile().toURL()));
  +                  log.log("Auto-deploying "+urlFile.getCanonicalFile());
  +               } catch (Exception e)
  +               {
  +                  log.warning("Cannot auto-deploy "+urlFile);
  +               }
  +            } else
  +            {
  +                        // This is a directory whose contents shall be checked for 
deployments
  +               try
  +               {
  +                  watchedDirectories.add(urlFile.getCanonicalFile());
  +                  log.log("Watching "+urlFile.getCanonicalFile());
  +               } catch (IOException e)
  +               {
  +                  log.warning(e.toString());
  +               }
  +            }
  +         } else if (urlFile.exists()) // It's a file
  +         {
  +               // Check if it's a JAR or zip
  +               if (!(url.endsWith(".jar") ||
  +                     url.endsWith(".ear") ||
  +                     url.endsWith(".war") ||
  +                     url.endsWith(".zip")))
  +                  continue; // Was not a JAR or zip - skip it...
  +
  +               try
  +               {
  +                  watchedURLs.add(new 
Deployment(urlFile.getCanonicalFile().toURL()));
  +                  log.log("Auto-deploying "+urlFile.getCanonicalFile());
  +               } catch (Exception e)
  +               {
  +                  log.warning("Cannot auto-deploy "+urlFile);
  +               }
  +         } else // It's a real URL (probably http:)
  +         {
  +            // Check if it's a JAR or zip
  +            if (!(url.endsWith(".jar") ||
  +                  url.endsWith(".ear") ||
  +                  url.endsWith(".war") ||
  +                  url.endsWith(".zip")))
  +               continue; // Was not a JAR or zip - skip it...
  +
  +            try
  +            {
  +               watchedURLs.add(new Deployment(new URL(url)));
  +            } catch (MalformedURLException e)
  +            {
  +               // Didn't work
  +               log.warning("Cannot auto-deploy "+url);
  +            }
  +         }
  +      }
  +
  +
         run(); // Pre-deploy. This is done so that deployments available
                         // on start of container is deployed ASAP
   
  @@ -320,6 +341,11 @@
      {
        // Stop auto deploy thread
         running = false;
  +      
  +      // Clear lists
  +      watchedDirectories.clear();
  +      watchedURLs.clear();
  +      deployedURLs.clear();
      }
   
      // Protected -----------------------------------------------------
  
  
  
  1.3       +7 -4      jboss/src/main/org/jboss/ejb/AutoDeployerMBean.java
  
  Index: AutoDeployerMBean.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/AutoDeployerMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AutoDeployerMBean.java    2000/05/30 18:32:15     1.2
  +++ AutoDeployerMBean.java    2000/12/07 15:44:08     1.3
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -13,7 +13,7 @@
    *      
    *   @see AutoDeployer
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public interface AutoDeployerMBean
        extends ServiceMBean
  @@ -22,6 +22,9 @@
      public static final String OBJECT_NAME = "EJB:service=AutoDeployer";
       
      // Public --------------------------------------------------------
  -   public void addURLs(String urlList);
  +   public void setURLs(String urlList);
  +   public String getURLs();
  +   public void setDeployer(String deployer);
  +   public String getDeployer();
   }
   
  
  
  
  1.9       +3 -3      jboss/src/main/org/jboss/ejb/CacheKey.java
  
  Index: CacheKey.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/CacheKey.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CacheKey.java     2000/10/17 17:52:24     1.8
  +++ CacheKey.java     2000/12/07 15:44:08     1.9
  @@ -1,9 +1,9 @@
   
   
   /*
  -* jBoss, the OpenSource EJB server
  +* JBoss, the OpenSource EJB server
   *
  -* Distributable under GPL license.
  +* Distributable under LGPL license.
   * See terms of license at gnu.org.
   */
   package org.jboss.ejb;
  @@ -21,7 +21,7 @@
   *
   *   @see org.jboss.ejb.plugins.NoPassivationInstanceCache.java
   *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  -*   @version $Revision: 1.8 $
  +*   @version $Revision: 1.9 $
   */
   public class CacheKey
       implements java.io.Externalizable
  
  
  
  1.33      +4 -4      jboss/src/main/org/jboss/ejb/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/Container.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Container.java    2000/11/08 13:01:42     1.32
  +++ Container.java    2000/12/07 15:44:09     1.33
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -54,7 +54,7 @@
   import org.jnp.server.NamingServer;
   
   /**
  - *    This is the base class for all EJB-containers in jBoss. A Container
  + *    This is the base class for all EJB-containers in JBoss. A Container
    *    functions as the central hub of all metadata and plugins. Through this
    *    the container plugins can get hold of the other plugins and any metadata they 
need.
    *
  @@ -67,7 +67,7 @@
    *   @see ContainerFactory
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.32 $
  + *   @version $Revision: 1.33 $
    */
   public abstract class Container
   {
  
  
  
  1.59      +108 -138  jboss/src/main/org/jboss/ejb/ContainerFactory.java
  
  Index: ContainerFactory.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- ContainerFactory.java     2000/12/06 13:00:55     1.58
  +++ ContainerFactory.java     2000/12/07 15:44:09     1.59
  @@ -1,7 +1,7 @@
   /*
  -* jBoss, the OpenSource EJB server
  +* JBoss, the OpenSource EJB server
   *
  -* Distributable under GPL license.
  +* Distributable under LGPL license.
   * See terms of license at gnu.org.
   */
   package org.jboss.ejb;
  @@ -79,7 +79,7 @@
   *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
   *   @author Peter Antman ([EMAIL PROTECTED])
   *
  -*   @version $Revision: 1.58 $
  +*   @version $Revision: 1.59 $
   */
   public class ContainerFactory
       extends org.jboss.util.ServiceMBeanSupport
  @@ -108,7 +108,7 @@
   
      // Enable metrics interceptor
      boolean metricsEnabled    = false;
  -   
  +
      // Public --------------------------------------------------------
   
      /**
  @@ -139,40 +139,6 @@
      }
   
      /**
  -   * Implements the template method in superclass. This method inits the factory
  -   */
  -   public void initService()
  -   {
  -/*
  -      URL tmpFile = getClass().getResource("/tmp.properties");
  -      if (tmpFile != null)
  -      {
  -         tmpDir = new File(new File(tmpFile.getFile()).getParent(),"deploy/");
  -         tmpDir.mkdirs();
  -
  -         log.debug("Temporary directory set to:"+tmpDir);
  -
  -         // Clear tmp directory of previously deployed files
  -         // This is to clear up if jBoss previously crashed, hence not removing 
files properly
  -         File[] files = tmpDir.listFiles();
  -         for (int i = 0; i < files.length; i++)
  -         {
  -            files[i].delete();
  -         }
  -
  -         if (files.length > 0)
  -         {
  -            log.debug("Previous deployments removed");
  -         }
  -      }
  -      else
  -      {
  -         log.debug("Using the systems temporary directory");
  -      }
  -*/
  -   }
  -
  -   /**
      * Implements the template method in superclass. This method stops all the
      * applications in this server.
      */
  @@ -247,19 +213,21 @@
      *
      * @param enable  true to enable; false to disable
      */
  -   public void setMetricsEnabled(boolean enable) {
  -       metricsEnabled = enable;
  +   public void setMetricsEnabled(boolean enable)
  +   {
  +      metricsEnabled = enable;
      }
  -   
  +
      /**
  -    * Checks if this container factory initializes the metrics interceptor.
  -    *
  -    * @return   true if metrics are enabled; false otherwise
  -    */
  -   public boolean isMetricsEnabled() {
  -       return metricsEnabled;
  +   * Checks if this container factory initializes the metrics interceptor.
  +   *
  +   * @return   true if metrics are enabled; false otherwise
  +   */
  +   public boolean isMetricsEnabled()
  +   {
  +      return metricsEnabled;
      }
  -   
  +
      /**
      *   Deploy the file at this URL. This method is typically called from remote 
administration
      *   tools that cannot handle java.net.URL's as parameters to methods
  @@ -351,8 +319,8 @@
   
            // wrapping this into a try - catch block to prevent errors in
            // verifier from stopping the deployment
  -         try {
  -
  +         try 
  +         {
               if (verifyDeployments)
               {
                  BeanVerifier verifier = new BeanVerifier();
  @@ -397,112 +365,113 @@
               BeanMetaData bean = (BeanMetaData)beans.next();
   
               log.log("Deploying "+bean.getEjbName());
  -         // Added message driven deployment
  -         if (bean.isMessageDriven()) {
  -             // Stolen from Stateless deploy
  -             // Create container
  -                  MessageDrivenContainer container = new MessageDrivenContainer();
  +            // Added message driven deployment
  +            if (bean.isMessageDriven())
  +            {
  +               // Stolen from Stateless deploy
  +               // Create container
  +               MessageDrivenContainer container = new MessageDrivenContainer();
   
  -                  // Create classloader for this container
  -                  // Only used to identify bean. Not really used for class loading!
  -                  container.setClassLoader(new URLClassLoader(new URL[0], cl));
  +               // Create classloader for this container
  +               // Only used to identify bean. Not really used for class loading!
  +               container.setClassLoader(new URLClassLoader(new URL[0], cl));
   
  -                  // Set metadata
  -                  container.setBeanMetaData(bean);
  +               // Set metadata
  +               container.setBeanMetaData(bean);
   
  -                  // get the container configuration for this bean
  -                  // a default configuration is now always provided
  -                  ConfigurationMetaData conf = bean.getContainerConfiguration();
  +               // get the container configuration for this bean
  +               // a default configuration is now always provided
  +               ConfigurationMetaData conf = bean.getContainerConfiguration();
   
  -                  // Set transaction manager
  -                  container.setTransactionManager((TransactionManager)new 
InitialContext().lookup("java:/TransactionManager"));
  +               // Set transaction manager
  +               container.setTransactionManager((TransactionManager)new 
InitialContext().lookup("java:/TransactionManager"));
   
  -                  // Set security manager & role mapping manager
  -                  String securityManagerJNDIName = conf.getAuthenticationModule();
  -                  String roleMappingManagerJNDIName = conf.getRoleMappingManager();
  +               // Set security manager & role mapping manager
  +               String securityManagerJNDIName = conf.getAuthenticationModule();
  +               String roleMappingManagerJNDIName = conf.getRoleMappingManager();
   
  -                  if ((securityManagerJNDIName != null) && 
(roleMappingManagerJNDIName != null))
  +               if ((securityManagerJNDIName != null) && (roleMappingManagerJNDIName 
!= null))
  +               {
  +                  try
                     {
  -                     try
  -                     {
  -                        EJBSecurityManager ejbS = (EJBSecurityManager)new 
InitialContext().lookup(securityManagerJNDIName);
  -                        container.setSecurityManager( ejbS );
  -                     }
  -                     catch (NamingException ne)
  -                     {
  -                        throw new DeploymentException( "Could not find the Security 
Manager specified for this container", ne );
  -                     }
  +                     EJBSecurityManager ejbS = (EJBSecurityManager)new 
InitialContext().lookup(securityManagerJNDIName);
  +                     container.setSecurityManager( ejbS );
  +                  }
  +                  catch (NamingException ne)
  +                  {
  +                     throw new DeploymentException( "Could not find the Security 
Manager specified for this container", ne );
  +                  }
   
  -                     try
  -                     {
  -                        RealmMapping rM = (RealmMapping)new 
InitialContext().lookup(roleMappingManagerJNDIName);
  -                        container.setRealmMapping( rM );
  -                     }
  -                     catch (NamingException ne)
  -                     {
  -                        throw new DeploymentException( "Could not find the Role 
Mapping Manager specified for this container", ne );
  -                     }
  +                  try
  +                  {
  +                     RealmMapping rM = (RealmMapping)new 
InitialContext().lookup(roleMappingManagerJNDIName);
  +                     container.setRealmMapping( rM );
  +                  }
  +                  catch (NamingException ne)
  +                  {
  +                     throw new DeploymentException( "Could not find the Role 
Mapping Manager specified for this container", ne );
                     }
  +               }
   
  -                  // Set container invoker
  -                  ContainerInvoker ci = null;
  +               // Set container invoker
  +               ContainerInvoker ci = null;
                    try {
   
                       ci = 
(ContainerInvoker)cl.loadClass(conf.getContainerInvoker()).newInstance();
  -                     } catch(Exception e) {
  +                  } catch(Exception e) {
                       throw new DeploymentException("Missing or invalid Container 
Invoker (in jboss.xml or standardjboss.xml): " + conf.getContainerInvoker() +" - " + 
e);
  -                     }
  +                  }
                    if (ci instanceof XmlLoadable) {
                      // the container invoker can load its configuration from the 
jboss.xml element
                      ((XmlLoadable)ci).importXml(conf.getContainerInvokerConf());
  -                     }
  +                  }
                    container.setContainerInvoker(ci);
   
  -                  // Set instance pool
  -                  InstancePool ip = null;
  +               // Set instance pool
  +               InstancePool ip = null;
                    try {
                       ip = 
(InstancePool)cl.loadClass(conf.getInstancePool()).newInstance();
  -                     } catch(Exception e) {
  +                  } catch(Exception e) {
                       throw new DeploymentException("Missing or invalid Instance Pool 
(in jboss.xml or standardjboss.xml)");
  -                     }
  +                  }
                     if (ip instanceof XmlLoadable) {
                      ((XmlLoadable)ip).importXml(conf.getContainerPoolConf());
  -                     }
  +                  }
                    container.setInstancePool(ip);
   
  -                  // Create interceptors
  +               // Create interceptors
   
  -                  container.addInterceptor(new LogInterceptor());
  -                  container.addInterceptor(new SecurityInterceptor());
  +               container.addInterceptor(new LogInterceptor());
  +               container.addInterceptor(new SecurityInterceptor());
   
  -                  if (((MessageDrivenMetaData)bean).isContainerManagedTx())
  -                  {
  -                     // CMT
  -                     container.addInterceptor(new TxInterceptorCMT());
  -                     
  -                     if (metricsEnabled)
  -                         container.addInterceptor(new MetricsInterceptor());
  -                     
  -                     container.addInterceptor(new 
MessageDrivenInstanceInterceptor());
  -                  }
  -                  else
  -                  {
  -                     // BMT
  -                     container.addInterceptor(new 
MessageDrivenInstanceInterceptor());
  -                  // FIXME. should we have a special BMT tx interceptor
  -                  // to place ACK there???
  -                     container.addInterceptor(new MessageDrivenTxInterceptorBMT());
  -                     
  -                     if (metricsEnabled)
  -                         container.addInterceptor(new MetricsInterceptor());
  -                  }
  +               if (((MessageDrivenMetaData)bean).isContainerManagedTx())
  +               {
  +                  // CMT
  +                  container.addInterceptor(new TxInterceptorCMT());
   
  -                  // Finally we add the last interceptor from the container
  -                  container.addInterceptor(container.createContainerInterceptor());
  +                  if (metricsEnabled)
  +                     container.addInterceptor(new MetricsInterceptor());
   
  -                  // Add container to application
  -                  app.addContainer(container);
  -         }
  +                  container.addInterceptor(new MessageDrivenInstanceInterceptor());
  +               }
  +               else
  +               {
  +                  // BMT
  +                  container.addInterceptor(new MessageDrivenInstanceInterceptor());
  +                  // FIXME. should we have a special BMT tx interceptor
  +                  // to place ACK there???
  +                  container.addInterceptor(new MessageDrivenTxInterceptorBMT());
  +
  +                  if (metricsEnabled)
  +                     container.addInterceptor(new MetricsInterceptor());
  +               }
  +
  +               // Finally we add the last interceptor from the container
  +               container.addInterceptor(container.createContainerInterceptor());
  +
  +               // Add container to application
  +               app.addContainer(container);
  +            }
               else if (bean.isSession()) // Is session?
               {
                  if (((SessionMetaData)bean).isStateless()) // Is stateless?
  @@ -585,10 +554,10 @@
                     {
                        // CMT
                        container.addInterceptor(new TxInterceptorCMT());
  -                     
  +
                        if (metricsEnabled)
  -                         container.addInterceptor(new MetricsInterceptor());
  -                     
  +                        container.addInterceptor(new MetricsInterceptor());
  +
                        container.addInterceptor(new 
StatelessSessionInstanceInterceptor());
                     }
                     else
  @@ -596,9 +565,9 @@
                        // BMT
                        container.addInterceptor(new 
StatelessSessionInstanceInterceptor());
                        container.addInterceptor(new TxInterceptorBMT());
  -                     
  +
                        if (metricsEnabled)
  -                         container.addInterceptor(new MetricsInterceptor());
  +                        container.addInterceptor(new MetricsInterceptor());
                     }
   
                     // Finally we add the last interceptor from the container
  @@ -690,10 +659,10 @@
                     {
                        // CMT
                        container.addInterceptor(new TxInterceptorCMT());
  -                     
  +
                        if (metricsEnabled)
                           container.addInterceptor(new MetricsInterceptor());
  -                     
  +
                        container.addInterceptor(new 
StatefulSessionInstanceInterceptor());
   
                     }
  @@ -702,9 +671,9 @@
                        // BMT : the tx interceptor needs the context from the 
instance interceptor
                        container.addInterceptor(new 
StatefulSessionInstanceInterceptor());
                        container.addInterceptor(new TxInterceptorBMT());
  -                     
  +
                        if (metricsEnabled)
  -                         container.addInterceptor(new MetricsInterceptor());
  +                        container.addInterceptor(new MetricsInterceptor());
                     }
   
                     container.addInterceptor(new SecurityInterceptor());
  @@ -820,12 +789,12 @@
                  // Create interceptors
                  container.addInterceptor(new LogInterceptor());
                  container.addInterceptor(new SecurityInterceptor());
  -               
  +
                  // entity beans are always CMT
                  container.addInterceptor(new TxInterceptorCMT());
  -               
  +
                  if (metricsEnabled)
  -                   container.addInterceptor(new MetricsInterceptor());
  +                  container.addInterceptor(new MetricsInterceptor());
   
                  container.addInterceptor(new EntityInstanceInterceptor());
                  container.addInterceptor(new EntitySynchronizationInterceptor());
  @@ -933,4 +902,5 @@
         return (deployments.get(url) != null);
      }
   }
  +
   
  
  
  
  1.8       +4 -4      jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java
  
  Index: ContainerFactoryMBean.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContainerFactoryMBean.java        2000/11/14 21:41:06     1.7
  +++ ContainerFactoryMBean.java        2000/12/07 15:44:09     1.8
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -15,13 +15,13 @@
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author Juha Lindfors ([EMAIL PROTECTED])
    *
  - *   @version $Revision: 1.7 $
  + *   @version $Revision: 1.8 $
    */
   public interface ContainerFactoryMBean
        extends org.jboss.util.ServiceMBean
   {
      // Constants -----------------------------------------------------
  -   public static String OBJECT_NAME = "EJB:service=ContainerFactory";
  +   public static String OBJECT_NAME = ":service=ContainerFactory";
       
      // Public --------------------------------------------------------
   
  
  
  
  1.6       +3 -3      jboss/src/main/org/jboss/ejb/ContainerInvoker.java
  
  Index: ContainerInvoker.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerInvoker.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContainerInvoker.java     2000/09/26 17:50:43     1.5
  +++ ContainerInvoker.java     2000/12/07 15:44:09     1.6
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -29,7 +29,7 @@
    *   @see Container
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.5 $
  + *   @version $Revision: 1.6 $
    */
   public interface ContainerInvoker
      extends ContainerPlugin
  
  
  
  1.2       +3 -3      jboss/src/main/org/jboss/ejb/ContainerInvokerContainer.java
  
  Index: ContainerInvokerContainer.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerInvokerContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerInvokerContainer.java    2000/06/16 13:10:19     1.1
  +++ ContainerInvokerContainer.java    2000/12/07 15:44:09     1.2
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -21,7 +21,7 @@
    *
    *   @see ContainerInvoker
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.1 $
  + *   @version $Revision: 1.2 $
    */
   public interface ContainerInvokerContainer
   {
  
  
  
  1.4       +3 -3      jboss/src/main/org/jboss/ejb/ContainerPlugin.java
  
  Index: ContainerPlugin.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerPlugin.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContainerPlugin.java      2000/05/30 18:32:16     1.3
  +++ ContainerPlugin.java      2000/12/07 15:44:09     1.4
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -14,7 +14,7 @@
    *      
    *   @see Service
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public interface ContainerPlugin
      extends Service
  
  
  
  1.4       +3 -3      jboss/src/main/org/jboss/ejb/DeploymentException.java
  
  Index: DeploymentException.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/DeploymentException.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeploymentException.java  2000/05/30 18:32:16     1.3
  +++ DeploymentException.java  2000/12/07 15:44:09     1.4
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -12,7 +12,7 @@
    *
    *   @see ContainerFactory
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public class DeploymentException
      extends Exception
  
  
  
  1.4       +3 -3      jboss/src/main/org/jboss/ejb/EJBClassLoader.java
  
  Index: EJBClassLoader.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EJBClassLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EJBClassLoader.java       2000/05/30 18:32:16     1.3
  +++ EJBClassLoader.java       2000/12/07 15:44:09     1.4
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -17,7 +17,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public class EJBClassLoader
      extends URLClassLoader
  
  
  
  1.23      +3 -3      jboss/src/main/org/jboss/ejb/EnterpriseContext.java
  
  Index: EnterpriseContext.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- EnterpriseContext.java    2000/11/19 01:58:05     1.22
  +++ EnterpriseContext.java    2000/12/07 15:44:10     1.23
  @@ -1,8 +1,8 @@
   
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -37,7 +37,7 @@
    *  @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *  @version $Revision: 1.22 $
  + *  @version $Revision: 1.23 $
    */
   public abstract class EnterpriseContext
   {
  
  
  
  1.34      +3 -3      jboss/src/main/org/jboss/ejb/EntityContainer.java
  
  Index: EntityContainer.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EntityContainer.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- EntityContainer.java      2000/11/14 12:52:40     1.33
  +++ EntityContainer.java      2000/12/07 15:44:10     1.34
  @@ -1,7 +1,7 @@
   /*
  -* jBoss, the OpenSource EJB server
  +* JBoss, the OpenSource EJB server
   *
  -* Distributable under GPL license.
  +* Distributable under LGPL license.
   * See terms of license at gnu.org.
   */
   package org.jboss.ejb;
  @@ -36,7 +36,7 @@
   *   @author Rickard �berg ([EMAIL PROTECTED])
   *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
   *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  -*   @version $Revision: 1.33 $
  +*   @version $Revision: 1.34 $
   */
   public class EntityContainer
   extends Container
  
  
  
  1.11      +3 -3      jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java
  
  Index: EntityEnterpriseContext.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EntityEnterpriseContext.java      2000/10/25 02:29:56     1.10
  +++ EntityEnterpriseContext.java      2000/12/07 15:44:10     1.11
  @@ -1,7 +1,7 @@
   /*
  -* jBoss, the OpenSource EJB server
  +* JBoss, the OpenSource EJB server
   *
  -* Distributable under GPL license.
  +* Distributable under LGPL license.
   * See terms of license at gnu.org.
   */
   package org.jboss.ejb;
  @@ -21,7 +21,7 @@
   *    @see EnterpriseContext
   *    @author Rickard �berg ([EMAIL PROTECTED])
   *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  -*    @version $Revision: 1.10 $
  +*    @version $Revision: 1.11 $
   */
   public class EntityEnterpriseContext
   extends EnterpriseContext
  
  
  
  1.3       +3 -3      jboss/src/main/org/jboss/ejb/EntityInstanceCache.java
  
  Index: EntityInstanceCache.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EntityInstanceCache.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EntityInstanceCache.java  2000/12/01 13:06:28     1.2
  +++ EntityInstanceCache.java  2000/12/07 15:44:10     1.3
  @@ -1,9 +1,9 @@
   package org.jboss.ejb;
   
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   
  @@ -18,7 +18,7 @@
    * 
    *   @see NoPassivationEntityInstanceCache.java    
    *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public interface EntityInstanceCache
      extends InstanceCache
  
  
  
  1.4       +3 -3      jboss/src/main/org/jboss/ejb/EntityPersistenceManager.java
  
  Index: EntityPersistenceManager.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EntityPersistenceManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EntityPersistenceManager.java     2000/10/09 20:15:34     1.3
  +++ EntityPersistenceManager.java     2000/12/07 15:44:10     1.4
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -24,7 +24,7 @@
    *
    *   @see EntityContainer
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public interface EntityPersistenceManager
      extends ContainerPlugin
  
  
  
  1.3       +3 -3      jboss/src/main/org/jboss/ejb/EntityPersistenceStore.java
  
  Index: EntityPersistenceStore.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EntityPersistenceStore.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EntityPersistenceStore.java       2000/10/09 20:15:34     1.2
  +++ EntityPersistenceStore.java       2000/12/07 15:44:10     1.3
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -27,7 +27,7 @@
    *   @see EntityPersistenceManager
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public interface EntityPersistenceStore
   extends ContainerPlugin
  
  
  
  1.6       +3 -3      jboss/src/main/org/jboss/ejb/InstanceCache.java
  
  Index: InstanceCache.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/InstanceCache.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InstanceCache.java        2000/12/01 13:06:28     1.5
  +++ InstanceCache.java        2000/12/07 15:44:10     1.6
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -14,7 +14,7 @@
    *      
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author Simone Bordet ([EMAIL PROTECTED])
  - *   @version $Revision: 1.5 $
  + *   @version $Revision: 1.6 $
    */
   public interface InstanceCache
      extends ContainerPlugin
  
  
  
  1.3       +3 -3      jboss/src/main/org/jboss/ejb/InstancePool.java
  
  Index: InstancePool.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/InstancePool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InstancePool.java 2000/10/09 20:15:35     1.2
  +++ InstancePool.java 2000/12/07 15:44:10     1.3
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -13,7 +13,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public interface InstancePool
      extends ContainerPlugin
  
  
  
  1.2       +3 -3      jboss/src/main/org/jboss/ejb/InstancePoolContainer.java
  
  Index: InstancePoolContainer.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/InstancePoolContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InstancePoolContainer.java        2000/06/16 13:10:20     1.1
  +++ InstancePoolContainer.java        2000/12/07 15:44:10     1.2
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -21,7 +21,7 @@
    *
    *   @see InstancePool
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.1 $
  + *   @version $Revision: 1.2 $
    */
   public interface InstancePoolContainer
   {
  
  
  
  1.3       +3 -3      jboss/src/main/org/jboss/ejb/Interceptor.java
  
  Index: Interceptor.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/Interceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Interceptor.java  2000/06/16 13:10:20     1.2
  +++ Interceptor.java  2000/12/07 15:44:10     1.3
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -16,7 +16,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public interface Interceptor
      extends ContainerPlugin
  
  
  
  1.9       +3 -3      jboss/src/main/org/jboss/ejb/MethodInvocation.java
  
  Index: MethodInvocation.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/MethodInvocation.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MethodInvocation.java     2000/10/02 15:40:00     1.8
  +++ MethodInvocation.java     2000/12/07 15:44:11     1.9
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -27,7 +27,7 @@
    *  @see <related>
    *  @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>.
  - *  @version $Revision: 1.8 $
  + *  @version $Revision: 1.9 $
    */
   public class MethodInvocation
   {
  
  
  
  1.21      +3 -3      jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java
  
  Index: StatefulSessionContainer.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- StatefulSessionContainer.java     2000/10/25 08:32:35     1.20
  +++ StatefulSessionContainer.java     2000/12/07 15:44:11     1.21
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -32,7 +32,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.20 $
  + *   @version $Revision: 1.21 $
    */
   public class StatefulSessionContainer
      extends Container
  
  
  
  1.5       +3 -3      
jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java
  
  Index: StatefulSessionEnterpriseContext.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StatefulSessionEnterpriseContext.java     2000/11/13 18:57:51     1.4
  +++ StatefulSessionEnterpriseContext.java     2000/12/07 15:44:11     1.5
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -19,7 +19,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.4 $
  + *   @version $Revision: 1.5 $
    */
   public class StatefulSessionEnterpriseContext
      extends EnterpriseContext
  
  
  
  1.3       +3 -3      
jboss/src/main/org/jboss/ejb/StatefulSessionPersistenceManager.java
  
  Index: StatefulSessionPersistenceManager.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatefulSessionPersistenceManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StatefulSessionPersistenceManager.java    2000/10/09 20:15:35     1.2
  +++ StatefulSessionPersistenceManager.java    2000/12/07 15:44:11     1.3
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -19,7 +19,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public interface StatefulSessionPersistenceManager
      extends ContainerPlugin
  
  
  
  1.15      +3 -3      jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java
  
  Index: StatelessSessionContainer.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- StatelessSessionContainer.java    2000/10/25 08:32:35     1.14
  +++ StatelessSessionContainer.java    2000/12/07 15:44:11     1.15
  @@ -1,7 +1,7 @@
   /*
  -* jBoss, the OpenSource EJB server
  +* JBoss, the OpenSource EJB server
   *
  -* Distributable under GPL license.
  +* Distributable under LGPL license.
   * See terms of license at gnu.org.
   */
   package org.jboss.ejb;
  @@ -29,7 +29,7 @@
   *   @see <related>
   *   @author Rickard �berg ([EMAIL PROTECTED])
   *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  -*   @version $Revision: 1.14 $
  +*   @version $Revision: 1.15 $
   */
   public class StatelessSessionContainer
       extends Container
  
  
  
  1.5       +3 -3      
jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java
  
  Index: StatelessSessionEnterpriseContext.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StatelessSessionEnterpriseContext.java    2000/10/09 20:15:35     1.4
  +++ StatelessSessionEnterpriseContext.java    2000/12/07 15:44:11     1.5
  @@ -1,7 +1,7 @@
   /*
  - * jBoss, the OpenSource EJB server
  + * JBoss, the OpenSource EJB server
    *
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    */
   package org.jboss.ejb;
  @@ -23,7 +23,7 @@
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.4 $
  + *   @version $Revision: 1.5 $
    */
   public class StatelessSessionEnterpriseContext
      extends EnterpriseContext
  
  
  

Reply via email to