User: starksm 
  Date: 01/09/11 11:38:18

  Modified:    src/main/org/jboss/mq/server JBossMQService.java
                        StateManager.java
  Log:
  Convert all logging to org.jboss.logging.Logger which is a subclass of
  org.apache.log4j.Category.
  
  Revision  Changes    Path
  1.6       +5 -5      jbossmq/src/main/org/jboss/mq/server/JBossMQService.java
  
  Index: JBossMQService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JBossMQService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JBossMQService.java       2001/09/01 03:01:00     1.5
  +++ JBossMQService.java       2001/09/11 18:38:18     1.6
  @@ -22,7 +22,7 @@
    * @author     <a href="mailto:[EMAIL PROTECTED]";>Juha Lindfors</a>
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
    * @see        JBossMQ subproject
  - * @version    $Revision: 1.5 $
  + * @version    $Revision: 1.6 $
    */
   public class JBossMQService extends ServiceMBeanSupport implements 
JBossMQServiceMBean
   {
  @@ -77,7 +77,7 @@
         }
         catch (Exception e)
         {
  -         category.warn("Could not create the destination: ", e);
  +         log.warn("Could not create the destination: ", e);
            throw e;
         }
   
  @@ -156,7 +156,7 @@
         }
         catch (Exception e)
         {
  -         category.warn("Could not create the destination: ", e);
  +         log.warn("Could not create the destination: ", e);
            throw e;
         }
   
  @@ -234,7 +234,7 @@
         }
         catch (Exception e)
         {
  -         category.warn("Could not destory the destination: ", e);
  +         log.warn("Could not destory the destination: ", e);
            throw e;
         }
   
  @@ -329,7 +329,7 @@
         }
         catch (Exception e)
         {
  -         category.warn("Could not destory the destination: ", e);
  +         log.warn("Could not destory the destination: ", e);
            throw e;
         }
   
  
  
  
  1.8       +13 -13    jbossmq/src/main/org/jboss/mq/server/StateManager.java
  
  Index: StateManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/StateManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StateManager.java 2001/09/08 19:32:22     1.7
  +++ StateManager.java 2001/09/11 18:38:18     1.8
  @@ -32,7 +32,7 @@
    *
    * @author     Norbert Lataille ([EMAIL PROTECTED])
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
  - * @version    $Revision: 1.7 $
  + * @version    $Revision: 1.8 $
    */
   public class StateManager extends ServiceMBeanSupport implements StateManagerMBean
   {
  @@ -73,7 +73,7 @@
       */
      public void setDurableSubscription(JMSServer server, DurableSubcriptionID sub, 
SpyTopic topic) throws JMSException
      {
  -      category.debug("Checking durable subscription: " + sub + ", on topic: " + 
topic);
  +      log.debug("Checking durable subscription: " + sub + ", on topic: " + topic);
         try
         {
            //Set the known Ids
  @@ -88,7 +88,7 @@
                  continue;
               }
   
  -            category.debug("Found a matching ClientID configuration section.");
  +            log.debug("Found a matching ClientID configuration section.");
   
               XElement subscription = null;
   
  @@ -106,7 +106,7 @@
   
               if (subscription == null)
               {
  -               category.debug("The subscription was not previously registered.");
  +               log.debug("The subscription was not previously registered.");
                  // it was not previously registered...
                  if (topic == null)
                  {
  @@ -126,7 +126,7 @@
               }
               else
               {
  -               category.debug("The subscription was previously registered.");
  +               log.debug("The subscription was previously registered.");
                  // it was previously registered...
                  if (topic == null)
                  {
  @@ -142,7 +142,7 @@
                  else if (!subscription.getField("TopicName").equals(topic.getName()))
                  {
                     //new topic so we have to change it
  -                  category.debug("But the topic was different, changing the 
subscription.");
  +                  log.debug("But the topic was different, changing the 
subscription.");
                     // we have to change the subscription...
                     SpyTopic prevTopic = new 
SpyTopic(subscription.getField("TopicName"));
                     JMSTopic dest = (JMSTopic)server.getJMSDestination(prevTopic);
  @@ -254,7 +254,7 @@
         }
         catch (org.jboss.mq.xml.XElementException e)
         {
  -         category.error(e);
  +         log.error(e);
            throw new JMSException("Invalid server user configuration.");
         }
      }
  @@ -358,13 +358,13 @@
            try
            {
   
  -            category.debug("Restarting Durable Subscription: " + clientId + "," + 
name + "," + topicName);
  +            log.debug("Restarting Durable Subscription: " + clientId + "," + name + 
"," + topicName);
               SpyTopic topic = new SpyTopic(topicName);
               JMSTopic dest = (JMSTopic)server.getJMSDestination(topic);
               if (dest == null)
               {
  -               category.warn("Subscription topic of not found: " + topicName);
  -               category.warn("Subscription cannot be initialized: " + clientId + 
"," + name);
  +               log.warn("Subscription topic of not found: " + topicName);
  +               log.warn("Subscription cannot be initialized: " + clientId + "," + 
name);
                  element.removeFromParent();
               }
               else
  @@ -375,7 +375,7 @@
            }
            catch (JMSException e)
            {
  -            category.error("Could not initialize a durable subscription for : 
Client Id=" + clientId + ", Name=" + name + ", Topic Name=" + topicName, e);
  +            log.error("Could not initialize a durable subscription for : Client 
Id=" + clientId + ", Name=" + name + ", Topic Name=" + topicName, e);
            }
         }
   
  @@ -392,12 +392,12 @@
         java.io.File jbossHome = new 
java.io.File(System.getProperty("jboss.system.home"));
         if (!jbossHome.exists())
         {
  -         category.error("jboss.system.configurationDirectory not found! : " + 
jbossHome);
  +         log.error("jboss.system.configurationDirectory not found! : " + jbossHome);
         }
         java.io.File file = new java.io.File(jbossHome, stateFile);
         if (!file.exists())
         {
  -         category.error("statefile not found! : " + file);
  +         log.error("statefile not found! : " + file);
         }
         java.io.InputStream in = new java.io.BufferedInputStream(new 
java.io.FileInputStream(file));
         stateConfig = XElement.createFrom(in);
  
  
  

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

Reply via email to