User: ejort   
  Date: 02/01/12 13:14:26

  Modified:    src/main/org/jboss/ejb/plugins AbstractInterceptor.java
                        BMPPersistenceManager.java
                        SecurityProxyInterceptor.java
                        StatefulSessionInstanceInterceptor.java
  Log:
  Remove directory reference to log4j Category in preparation for log4j 1.2
  
  Revision  Changes    Path
  1.12      +4 -4      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractInterceptor.java  2001/12/19 05:35:47     1.11
  +++ AbstractInterceptor.java  2002/01/12 21:14:26     1.12
  @@ -14,21 +14,21 @@
   
   /**
    * An abstract base class for container interceptors.
  - *      
  + *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard Öberg</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public abstract class AbstractInterceptor
      implements Interceptor
   {
      // Constants -----------------------------------------------------
  -    
  +
      // Attributes ----------------------------------------------------
   
      /** The next interceptor in the chain. */
      protected Interceptor nextInterceptor;
  -   /** Use a JBoss custom log4j category for trace level logging */
  +   /** Logging instance */
      protected Logger log = Logger.getLogger(this.getClass());
   
      // Static --------------------------------------------------------
  
  
  
  1.35      +3 -3      jboss/src/main/org/jboss/ejb/plugins/BMPPersistenceManager.java
  
  Index: BMPPersistenceManager.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/BMPPersistenceManager.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- BMPPersistenceManager.java        2001/12/19 05:37:57     1.34
  +++ BMPPersistenceManager.java        2002/01/12 21:14:26     1.35
  @@ -29,9 +29,9 @@
   import org.jboss.ejb.EntityPersistenceManager;
   import org.jboss.ejb.EntityEnterpriseContext;
   
  +import org.jboss.logging.Logger;
   import org.jboss.management.j2ee.CountStatistic;
   import org.jboss.management.j2ee.TimeStatistic;
  -import org.apache.log4j.Category;
   
   /**
   *   <description>
  @@ -40,7 +40,7 @@
   *  @author <a href="mailto:[EMAIL PROTECTED]";>Rickard Öberg</a>
   *  @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
   *  @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
  -*  @version $Revision: 1.34 $
  +*  @version $Revision: 1.35 $
   *
   *  <p><b>Revisions:</b>
   *  <p><b>20010709 andreas schaefer:</b>
  @@ -58,7 +58,7 @@
      // Constants -----------------------------------------------------
   
      // Attributes ----------------------------------------------------
  -   Category log = Category.getInstance(BMPPersistenceManager.class);
  +   Logger log = Logger.getLogger(BMPPersistenceManager.class);
   
      EntityContainer con;
   
  
  
  
  1.10      +3 -4      
jboss/src/main/org/jboss/ejb/plugins/SecurityProxyInterceptor.java
  
  Index: SecurityProxyInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SecurityProxyInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SecurityProxyInterceptor.java     2001/12/19 05:42:31     1.9
  +++ SecurityProxyInterceptor.java     2002/01/12 21:14:26     1.10
  @@ -11,12 +11,11 @@
   import javax.ejb.EJBContext;
   import javax.naming.InitialContext;
   
  -import org.apache.log4j.Category;
  -
   import org.jboss.ejb.Container;
   import org.jboss.ejb.ContainerInvokerContainer;
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.invocation.Invocation;
  +import org.jboss.logging.Logger;
   
   import org.jboss.security.AuthenticationManager;
   import org.jboss.security.SecurityProxy;
  @@ -30,7 +29,7 @@
    * interceptor has access to the EJB instance and context.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class SecurityProxyInterceptor
      extends AbstractInterceptor
  @@ -43,7 +42,7 @@
         "java:/SecurityProxyFactory";
   
      /** Instance logger. */
  -   protected Category log = Category.getInstance(this.getClass());
  +   protected Logger log = Logger.getLogger(this.getClass());
      
      /**
       * @clientCardinality 0..1
  
  
  
  1.26      +3 -4      
jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
  
  Index: StatefulSessionInstanceInterceptor.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- StatefulSessionInstanceInterceptor.java   2001/12/30 08:59:16     1.25
  +++ StatefulSessionInstanceInterceptor.java   2002/01/12 21:14:26     1.26
  @@ -17,8 +17,6 @@
   import javax.ejb.EJBException;
   import javax.ejb.EJBObject;
   
  -import org.apache.log4j.Category;
  -
   import org.jboss.ejb.BeanLock;
   import org.jboss.ejb.BeanLockManager;
   import org.jboss.ejb.Container;
  @@ -27,6 +25,7 @@
   import org.jboss.ejb.StatefulSessionContainer;
   import org.jboss.ejb.EnterpriseContext;
   import org.jboss.invocation.Invocation;
  +import org.jboss.logging.Logger;
   import org.jboss.metadata.SessionMetaData;
   
   import org.jboss.security.SecurityAssociation;
  @@ -37,7 +36,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard Öberg</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
  - * @version $Revision: 1.25 $
  + * @version $Revision: 1.26 $
    *
    * <p><b>Revisions:</b>
    * <p><b>20010704 marcf</b>
  @@ -57,7 +56,7 @@
      // Attributes ---------------------------------------------------
   
      /** Instance logger. */
  -   protected Category log = Category.getInstance(this.getClass());
  +   protected Logger log = Logger.getLogger(this.getClass());
      
      protected StatefulSessionContainer container;
        
  
  
  

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

Reply via email to