User: starksm 
  Date: 01/11/25 19:12:26

  Modified:    src/main/org/jboss/ejb/plugins AbstractInstanceCache.java
                        AbstractInstancePool.java AbstractInterceptor.java
                        AbstractTxInterceptor.java
                        EnterpriseContextCachePolicy.java
                        LRUEnterpriseContextCachePolicy.java
                        LRUStatefulContextCachePolicy.java
                        SecurityInterceptor.java
                        SingletonStatelessSessionInstancePool.java
                        StatefulSessionFilePersistenceManager.java
                        StatefulSessionInstanceCache.java
  Log:
  Drop the org.jboss.ejb.DeploymentException in favor of the
  org.jboss.deployment.DeploymentException class.
  
  Clean up the org.jboss.logging.Logger to use the Logger.getLogger
  factory method.
  
  Revision  Changes    Path
  1.23      +8 -9      jboss/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java
  
  Index: AbstractInstanceCache.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInstanceCache.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- AbstractInstanceCache.java        2001/11/24 20:43:22     1.22
  +++ AbstractInstanceCache.java        2001/11/26 03:12:25     1.23
  @@ -29,23 +29,22 @@
   
   import org.w3c.dom.Element;
   
  -import org.jboss.util.CachePolicy;
  -import org.jboss.util.Executable;
  -import org.jboss.util.WorkerQueue;
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.ejb.InstanceCache;
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.EntityEnterpriseContext;
  -import org.jboss.ejb.DeploymentException;
   import org.jboss.ejb.Container;
   import org.jboss.ejb.BeanLock;
   import org.jboss.ejb.BeanLockManager;
  +import org.jboss.logging.Logger;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.XmlLoadable;
  -import org.jboss.logging.Logger;
  -
   import org.jboss.monitor.Monitorable;
   import org.jboss.monitor.client.BeanCacheSnapshot;
   import org.jboss.monitor.MetricsConstants;
  +import org.jboss.util.CachePolicy;
  +import org.jboss.util.Executable;
  +import org.jboss.util.WorkerQueue;
   
   /**
    * Base class for caches of entity and stateful beans. <p>
  @@ -62,7 +61,7 @@
    * @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
    * @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
    *
  - * @version $Revision: 1.22 $
  + * @version $Revision: 1.23 $
    *
    *   <p><b>Revisions:</b>
    *
  @@ -92,7 +91,7 @@
      // Constants -----------------------------------------------------
   
      // Attributes ----------------------------------------------------
  -   protected static Logger log = Logger.create(AbstractInstanceCache.class);
  +   protected static Logger log = Logger.getLogger(AbstractInstanceCache.class);
      /* The object that is delegated to implement the desired caching policy */
      private CachePolicy m_cache;
      /* The worker queue that passivates beans in another thread */
  @@ -866,7 +865,7 @@
   
   class PassivatorQueue extends WorkerQueue
   {
  -   protected static Logger log = Logger.create(PassivatorQueue.class);
  +   protected static Logger log = Logger.getLogger(PassivatorQueue.class);
      /**
       * Used for debug purposes, holds the scheduled passivation jobs
       */
  
  
  
  1.19      +2 -2      jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java
  
  Index: AbstractInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AbstractInstancePool.java 2001/11/24 20:43:22     1.18
  +++ AbstractInstancePool.java 2001/11/26 03:12:25     1.19
  @@ -18,7 +18,7 @@
   import org.jboss.ejb.EnterpriseContext;
   
   import org.w3c.dom.Element;
  -import org.jboss.ejb.DeploymentException;
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.XmlLoadable;
   
  @@ -37,7 +37,7 @@
   *  @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
   *   
  -*  @version $Revision: 1.18 $
  +*  @version $Revision: 1.19 $
   *
   *  <p><b>Revisions:</b>
   *  <p><b>20010704 marcf:</b>
  
  
  
  1.10      +2 -2      jboss/src/main/org/jboss/ejb/plugins/AbstractInterceptor.java
  
  Index: AbstractInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractInterceptor.java  2001/11/24 20:43:22     1.9
  +++ AbstractInterceptor.java  2001/11/26 03:12:25     1.10
  @@ -17,7 +17,7 @@
    *      
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public abstract class AbstractInterceptor
      implements Interceptor
  @@ -29,7 +29,7 @@
      /** The next interceptor in the chain. */
      protected Interceptor nextInterceptor;
      /** Use a JBoss custom log4j category for trace level logging */
  -   protected Logger log = Logger.create(this.getClass());
  +   protected Logger log = Logger.getLogger(this.getClass());
   
      // Static --------------------------------------------------------
   
  
  
  
  1.7       +1 -3      jboss/src/main/org/jboss/ejb/plugins/AbstractTxInterceptor.java
  
  Index: AbstractTxInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractTxInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractTxInterceptor.java        2001/09/11 18:34:59     1.6
  +++ AbstractTxInterceptor.java        2001/11/26 03:12:25     1.7
  @@ -25,15 +25,13 @@
    *  A common superclass for the transaction interceptors.
    *
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
  - *  @version $Revision: 1.6 $
  + *  @version $Revision: 1.7 $
    */
   abstract class AbstractTxInterceptor
      extends AbstractInterceptor
   {
   
       // Attributes ----------------------------------------------------
  -   protected Logger log = Logger.create(this.getClass());
  -
       /** Local reference to the container's TransactionManager. */
       protected TransactionManager tm;
   
  
  
  
  1.9       +2 -2      
jboss/src/main/org/jboss/ejb/plugins/EnterpriseContextCachePolicy.java
  
  Index: EnterpriseContextCachePolicy.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/EnterpriseContextCachePolicy.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EnterpriseContextCachePolicy.java 2001/09/11 18:34:59     1.8
  +++ EnterpriseContextCachePolicy.java 2001/11/26 03:12:25     1.9
  @@ -18,14 +18,14 @@
    * 
    * @see AbstractInstanceCache
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    */
   public interface EnterpriseContextCachePolicy extends CachePolicy
   {
        // Constants -----------------------------------------------------
   
        // Static --------------------------------------------------------
  -     public static Logger log = Logger.create(EnterpriseContextCachePolicy.class);
  +     public static Logger log = 
Logger.getLogger(EnterpriseContextCachePolicy.class);
        public static Scheduler scheduler = new Scheduler();
        
        // Public --------------------------------------------------------
  
  
  
  1.14      +2 -2      
jboss/src/main/org/jboss/ejb/plugins/LRUEnterpriseContextCachePolicy.java
  
  Index: LRUEnterpriseContextCachePolicy.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/LRUEnterpriseContextCachePolicy.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LRUEnterpriseContextCachePolicy.java      2001/09/11 18:34:59     1.13
  +++ LRUEnterpriseContextCachePolicy.java      2001/11/26 03:12:25     1.14
  @@ -13,7 +13,7 @@
   
   import org.jboss.util.LRUCachePolicy;
   import org.jboss.util.TimerTask;
  -import org.jboss.ejb.DeploymentException;
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.metadata.XmlLoadable;
   import org.jboss.metadata.MetaData;
  @@ -27,7 +27,7 @@
    *
    * @see AbstractInstanceCache
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    */
   public class LRUEnterpriseContextCachePolicy
      extends LRUCachePolicy
  
  
  
  1.5       +2 -2      
jboss/src/main/org/jboss/ejb/plugins/LRUStatefulContextCachePolicy.java
  
  Index: LRUStatefulContextCachePolicy.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/LRUStatefulContextCachePolicy.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LRUStatefulContextCachePolicy.java        2001/11/24 20:43:22     1.4
  +++ LRUStatefulContextCachePolicy.java        2001/11/26 03:12:25     1.5
  @@ -8,7 +8,7 @@
   
   
   import org.jboss.util.TimerTask;
  -import org.jboss.ejb.DeploymentException;
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.MetaData;
   
   import org.w3c.dom.Element;
  @@ -17,7 +17,7 @@
    * Least Recently Used cache policy for StatefulSessionEnterpriseContexts.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class LRUStatefulContextCachePolicy extends LRUEnterpriseContextCachePolicy
   {
  
  
  
  1.26      +1 -3      jboss/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java
  
  Index: SecurityInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- SecurityInterceptor.java  2001/11/24 20:43:22     1.25
  +++ SecurityInterceptor.java  2001/11/26 03:12:25     1.26
  @@ -14,7 +14,6 @@
   
   import org.jboss.ejb.Container;
   import org.jboss.ejb.MethodInvocation;
  -import org.jboss.logging.Logger;
   import org.jboss.metadata.BeanMetaData;
   import org.jboss.metadata.SecurityIdentityMetaData;
   import org.jboss.security.AnybodyPrincipal;
  @@ -28,11 +27,10 @@
   
   @author <a href="[EMAIL PROTECTED]">Oleg Nitz</a>
   @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
  -@version $Revision: 1.25 $
  +@version $Revision: 1.26 $
   */
   public class SecurityInterceptor extends AbstractInterceptor
   {
  -    protected static Logger log = Logger.create(SecurityInterceptor.class);
       /**
        * @clientCardinality 0..1
        * @supplierCardinality 1
  
  
  
  1.14      +2 -2      
jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java
  
  Index: SingletonStatelessSessionInstancePool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SingletonStatelessSessionInstancePool.java        2001/11/24 20:43:23     1.13
  +++ SingletonStatelessSessionInstancePool.java        2001/11/26 03:12:25     1.14
  @@ -11,11 +11,11 @@
   import java.util.Map;
   import java.util.HashMap;
   
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.ejb.Container;
   import org.jboss.ejb.InstancePool;
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.StatelessSessionEnterpriseContext;
  -import org.jboss.ejb.DeploymentException;
   
   import org.jboss.metadata.XmlLoadable;
   import org.jboss.metadata.MetaData;
  @@ -29,7 +29,7 @@
    *
    *  @see <related>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
  - *  @version $Revision: 1.13 $
  + *  @version $Revision: 1.14 $
    *
    * <p><b>Revisions:</b>
    * <p><b>20010718 andreas schaefer:</b>
  
  
  
  1.26      +3 -3      
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionFilePersistenceManager.java
  
  Index: StatefulSessionFilePersistenceManager.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionFilePersistenceManager.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- StatefulSessionFilePersistenceManager.java        2001/11/24 20:43:23     1.25
  +++ StatefulSessionFilePersistenceManager.java        2001/11/26 03:12:25     1.26
  @@ -44,15 +44,15 @@
   *  @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
   *  @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   *  @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
  -*  @version $Revision: 1.25 $
  +*  @version $Revision: 1.26 $
   */
   public class StatefulSessionFilePersistenceManager
  -implements StatefulSessionPersistenceManager
  +   implements StatefulSessionPersistenceManager
   {
       // Constants -----------------------------------------------------
       
       // Attributes ----------------------------------------------------
  -   private static Logger log = 
Logger.create(StatefulSessionFilePersistenceManager.class);
  +   private static Logger log = 
Logger.getLogger(StatefulSessionFilePersistenceManager.class);
       private StatefulSessionContainer con;
       
       private Method ejbActivate;
  
  
  
  1.14      +1 -3      
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java
  
  Index: StatefulSessionInstanceCache.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StatefulSessionInstanceCache.java 2001/11/24 20:43:23     1.13
  +++ StatefulSessionInstanceCache.java 2001/11/26 03:12:25     1.14
  @@ -24,14 +24,13 @@
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.ejb.StatefulSessionEnterpriseContext;
   import org.jboss.ejb.StatefulSessionPersistenceManager;
  -import org.jboss.logging.Logger;
   
   /**
    * Cache for stateful session beans.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Simone Bordet</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    */
   public class StatefulSessionInstanceCache
       extends AbstractInstanceCache
  @@ -39,7 +38,6 @@
       // Constants -----------------------------------------------------
   
       // Attributes ----------------------------------------------------
  -   protected Logger log = Logger.create(StatefulSessionInstanceCache.class);
       /* The container */
       private StatefulSessionContainer m_container;
       /* The map that holds passivated beans that will be removed */
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to