User: starksm 
  Date: 01/11/20 01:25:34

  Modified:    src/main/org/jboss/mq/server Tag: Branch_2_4
                        JBossMQService.java StateManager.java
  Log:
  Change to the unified log4j based org.jboss.logging.Logger class.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.2   +6 -6      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.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- JBossMQService.java       2001/08/23 03:57:12     1.3.2.1
  +++ JBossMQService.java       2001/11/20 09:25:34     1.3.2.2
  @@ -26,7 +26,7 @@
    * @author     Hiram Chirino ([EMAIL PROTECTED])
    * @created    August 16, 2001
    * @see        JBossMQ subproject
  - * @version    $Revision: 1.3.2.1 $
  + * @version    $Revision: 1.3.2.2 $
    */
   public class JBossMQService extends org.jboss.util.ServiceMBeanSupport implements 
JBossMQServiceMBean {
      MBeanServer      mBeanServer = null;
  @@ -57,7 +57,7 @@
            getServer().invoke( objectName, "start", new Object[]{}, new String[]{} );
   
         } catch ( Exception e ) {
  -         category.warn( "Could not create the destination: ", e );
  +         log.warn( "Could not create the destination: ", e );
            throw e;
         }
   
  @@ -115,7 +115,7 @@
            getServer().invoke( objectName, "start", new Object[]{}, new String[]{} );
   
         } catch ( Exception e ) {
  -         category.warn( "Could not create the destination: ", e );
  +         log.warn( "Could not create the destination: ", e );
            throw e;
         }
   
  @@ -172,7 +172,7 @@
            getServer().unregisterMBean( objectName );
   
         } catch ( Exception e ) {
  -         category.warn( "Could not destory the destination: ", e );
  +         log.warn( "Could not destory the destination: ", e );
            throw e;
         }
   
  @@ -240,7 +240,7 @@
            getServer().unregisterMBean( objectName );
   
         } catch ( Exception e ) {
  -         category.warn( "Could not destory the destination: ", e );
  +         log.warn( "Could not destory the destination: ", e );
            throw e;
         }
   
  @@ -306,7 +306,7 @@
      protected void startService()
         throws Exception {
         jmsServer.startServer();
  -       category.info(""+jmsServer+" Started");
  +       log.info(""+jmsServer+" Started");
      }
   
      protected void stopService() {
  
  
  
  1.2.2.2   +11 -11    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.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- StateManager.java 2001/08/23 03:57:12     1.2.2.1
  +++ StateManager.java 2001/11/20 09:25:34     1.2.2.2
  @@ -35,7 +35,7 @@
    * @author     Norbert Lataille ([EMAIL PROTECTED])
    * @author     Hiram Chirino ([EMAIL PROTECTED])
    * @created    August 16, 2001
  - * @version    $Revision: 1.2.2.1 $
  + * @version    $Revision: 1.2.2.2 $
    */
   public class StateManager extends org.jboss.util.ServiceMBeanSupport implements 
StateManagerMBean {
   
  @@ -62,7 +62,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
            Enumeration enum = stateConfig.getElementsNamed( "User" );
  @@ -74,7 +74,7 @@
                  continue;
               }
   
  -            category.debug( "Found a matching ClientID configuration section." );
  +            log.debug( "Found a matching ClientID configuration section." );
   
               XElement subscription = null;
   
  @@ -89,7 +89,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 ) {
                     return;
  @@ -106,7 +106,7 @@
                  saveConfig();
   
               } else {
  -               category.debug( "The subscription was previously registered." );
  +               log.debug( "The subscription was previously registered." );
                  // it was previously registered...
                  if ( topic == null ) {
                     // we have to change the subscription...
  @@ -119,7 +119,7 @@
                     saveConfig();
                  } 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 );
  @@ -203,7 +203,7 @@
               throw new JMSSecurityException( "This user does not exist" );
            }
         } catch ( org.jboss.mq.xml.XElementException e ) {
  -         category.error( e );
  +         log.error( e );
            throw new JMSException( "Invalid server user configuration." );
         }
      }
  @@ -269,19 +269,19 @@
   
            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 {
                  dest.createDurableSubscription( new DurableSubcriptionID( clientId, 
name ) );
               }
   
            } 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 );
            }
         }
   
  
  
  

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

Reply via email to