User: starksm 
  Date: 01/09/11 11:39:55

  Modified:    src/main/org/jboss/ha HAConfigNodeImpl.java
                        HAConfigServer.java
  Log:
  Convert all logging to org.jboss.logging.Logger which is a subclass of
  org.apache.log4j.Category.
  
  Revision  Changes    Path
  1.4       +17 -18    jbossmx/src/main/org/jboss/ha/HAConfigNodeImpl.java
  
  Index: HAConfigNodeImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmx/src/main/org/jboss/ha/HAConfigNodeImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HAConfigNodeImpl.java     2001/09/01 19:50:29     1.3
  +++ HAConfigNodeImpl.java     2001/09/11 18:39:55     1.4
  @@ -20,8 +20,6 @@
   import JavaGroups.DistributedTree.DistributedTreeListener;
   import JavaGroups.Address;
   import JavaGroups.Common.Trace;
  -
  -// TODO this needs to be replaced with the log4j logging
   import org.jboss.logging.Logger;
   
   import org.jboss.ejb.plugins.jrmp.interfaces.ContainerRemote;
  @@ -31,7 +29,7 @@
    *
    *   @see HAConfigNode
    *   @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    *
    *   <p><b>Revisions:</b>
    *
  @@ -43,6 +41,7 @@
   
   public class HAConfigNodeImpl implements HAConfigNode
   {
  +   static Logger log = Logger.create(HAConfigNodeImpl.class);
   
      public interface HAEventsCallbackable
      {
  @@ -202,7 +201,7 @@
            catch (Exception e)
            {e.printStackTrace (); }
         else
  -         Logger.debug ("registerContainer: called while distributed hashtable 
unavailble!");
  +         log.debug ("registerContainer: called while distributed hashtable 
unavailble!");
      }
   
      public void unregisterContainer (String application, String beanname, String 
type)
  @@ -218,7 +217,7 @@
            catch (Exception e)
            {e.printStackTrace (); }
         else
  -         Logger.debug ("unregisterContainer: called while distributed hashtable 
unavailble!");
  +         log.debug ("unregisterContainer: called while distributed hashtable 
unavailble!");
      }
   
      public Vector getReplicateContainers (String application, String beanname, 
String type)
  @@ -330,7 +329,7 @@
            result = this.getEntries (builtName);
         else
         {
  -         Logger.debug ("getReplicateContainers: called while distributed hashtable 
unavailble!");
  +         log.debug ("getReplicateContainers: called while distributed hashtable 
unavailble!");
            result = new Vector ();
         }
   
  @@ -494,7 +493,7 @@
                  //we only propagate events for which we are not concerned
                  //
               {
  -               Logger.debug ("Event will be forwarded : " + concernedNode + ", " + 
clusterName );
  +               log.debug ("Event will be forwarded : " + concernedNode + ", " + 
clusterName );
                  EventEntry entry = new EventEntry ();
   
                  entry.eventType = EventEntry.ADD_EVENT;
  @@ -508,16 +507,16 @@
                  wakeUpThread ();
               }
               else
  -               Logger.debug ("... event not forwarded locally.");
  +               log.debug ("... event not forwarded locally.");
            }
            else
  -            Logger.debug ("... event not forwarded locally.");
  +            log.debug ("... event not forwarded locally.");
         }
   
         public void addNodeModifiedEvent (String fqn, Serializable contentBefore, 
Serializable contentAfter)
         {
            java.util.Vector splitName = getSplitName (fqn);
  -         Logger.debug ("Modify Event : " + fqn);
  +         log.debug ("Modify Event : " + fqn);
            if (splitName.size () == 5)
            {
               String clusterName = (String)splitName.elementAt (0);
  @@ -545,16 +544,16 @@
                  wakeUpThread ();
               }
               else
  -               Logger.debug ("... event not forwarded locally.");
  +               log.debug ("... event not forwarded locally.");
            }
            else
  -            Logger.debug ("... event not forwarded locally.");
  +            log.debug ("... event not forwarded locally.");
         }
   
         public void addNodeRemovedEvent (String fqn)
         {
            java.util.Vector splitName = getSplitName (fqn);
  -         Logger.debug ("Remove Event : " + fqn);
  +         log.debug ("Remove Event : " + fqn);
            // we may add a check here: if size == 1 and this is for a node for
            // which we still have a son, there is a problem. Maybe usefull during 
debugging
            //
  @@ -583,10 +582,10 @@
                  wakeUpThread ();
               }
               else
  -               Logger.debug ("... event not forwarded locally.");
  +               log.debug ("... event not forwarded locally.");
            }
            else
  -            Logger.debug ("... event not forwarded locally.");
  +            log.debug ("... event not forwarded locally.");
         }
   
         private synchronized void wakeUpThread ()
  @@ -622,7 +621,7 @@
   
            synchronized (callbacks)
            { staticCopy = new Hashtable (callbacks); }
  -         Logger.debug ("Number of dead replicats: " + addresses.size ());
  +         log.debug ("Number of dead replicats: " + addresses.size ());
   
            for (Enumeration e = staticCopy.keys () ; e.hasMoreElements () ;)
            {
  @@ -636,7 +635,7 @@
                  // ***********************
                  if (addresses.contains (aReplica.javaGropupsNodeName))
                  {
  -                  Logger.debug ("Because of a death, we suppress this replica from 
our list: " + aReplica.toString ());
  +                  log.debug ("Because of a death, we suppress this replica from our 
list: " + aReplica.toString ());
                     removeEntry (path, aReplica.node);
                     // we do not inform our container because has the removing will 
be propagated, we will receive such
                     // information in a few time...
  @@ -664,7 +663,7 @@
   
         public void ViewChange (Vector new_mbrs,Vector old_mbrs)
         {
  -         Logger.log  ("Information", "View changed message received : " + new_mbrs 
+ ", old members : " + old_mbrs);
  +         log.info  ("View changed message received : " + new_mbrs + ", old members 
: " + old_mbrs);
   
            if (old_mbrs.size () > 0)
            {
  
  
  
  1.3       +3 -3      jbossmx/src/main/org/jboss/ha/HAConfigServer.java
  
  Index: HAConfigServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmx/src/main/org/jboss/ha/HAConfigServer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HAConfigServer.java       2001/08/30 02:16:50     1.2
  +++ HAConfigServer.java       2001/09/11 18:39:55     1.3
  @@ -31,7 +31,7 @@
    *
    *   @see HAConfigServerMBean
    *   @author <a href="mailto:[EMAIL PROTECTED]";>Sacha Labourey</a>
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    *
    *   <p><b>Revisions:</b>
    *
  @@ -207,7 +207,7 @@
         
         bind (ctx, where, ref);
         
  -      log.log ("HAConfigService Service '" + where + "' bound to " + m_bindName);
  +      log.info ("HAConfigService Service '" + where + "' bound to " + m_bindName);
      }
      
      // This method is used to bind a smaller view of the HA Service used by proxies 
to update their view
  @@ -241,7 +241,7 @@
         {
            new InitialContext ().unbind (where);
            NonSerializableFactory.unbind (where);
  -         log.log ("HAConfigService service '" + _jndiName + "' removed from JNDI");
  +         log.info ("HAConfigService service '" + _jndiName + "' removed from JNDI");
         }
      }
      
  
  
  

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

Reply via email to