[jboss-cvs] JBoss Messaging SVN: r2799 - in trunk/src/main/org/jboss: jms/server/bridge and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jun 25 19:03:21 EDT 2007


Author: timfox
Date: 2007-06-25 19:03:21 -0400 (Mon, 25 Jun 2007)
New Revision: 2799

Modified:
   trunk/src/main/org/jboss/jms/server/ServerPeer.java
   trunk/src/main/org/jboss/jms/server/bridge/Bridge.java
   trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
   trunk/src/main/org/jboss/jms/server/destination/QueueService.java
   trunk/src/main/org/jboss/jms/server/destination/TopicService.java
   trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
   trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
Removed some extraneous log statements


Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -176,8 +176,6 @@
    // Constructors ---------------------------------------------------------------------------------
    public ServerPeer() throws Exception
    {
-      log.info("creating server peer");
-
       // Some wired components need to be started here
       securityStore = new SecurityMetadataStore();
 
@@ -624,7 +622,6 @@
          throw new IllegalArgumentException("Attempt to set negative ServerPeerID: " + serverPeerID);
       }
       this.serverPeerID = serverPeerID;
-      log.info("ServerPeerID set to " + serverPeerID);
    }
 
    public int getServerPeerID()

Modified: trunk/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/bridge/Bridge.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/jms/server/bridge/Bridge.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -1285,7 +1285,7 @@
          }
          else
          {
-            log.info("Succeeded in reconnecting to servers");
+            log.debug("Succeeded in reconnecting to servers");
             
             synchronized (lock)
             {

Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -382,8 +382,6 @@
 		            
 		            Map failoverMap = serverPeer.getPostOfficeInstance().getFailoverMap();
 		
-		            log.info("****** CF DEPLOYED/UNDEPLOYED: " + delArr.length + ":" + failoverMap.size());
-		            
 		            endpoint.updateClusteredClients(delArr, failoverMap);
                }
             }

Modified: trunk/src/main/org/jboss/jms/server/destination/QueueService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/QueueService.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/jms/server/destination/QueueService.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -73,12 +73,8 @@
          
          Queue queue;
          
-         log.info("*** starting queue service " + destination.getName());
-         
          if (binding != null)
          {                     
-         	log.info("***** queue already exists");
-         	
          	queue = binding.queue;
          	
          	if (queue.isActive())
@@ -102,9 +98,7 @@
          else
          {           
             // Create a new queue
-         	
-         	log.info("**** queue does not already exist");
-            
+
             JMSCondition queueCond = new JMSCondition(true, destination.getName());
             
             queue = new MessagingQueue(nodeId, destination.getName(),
@@ -161,8 +155,6 @@
       {
       	serverPeer.getDestinationManager().unregisterDestination(destination);
       	
-      	log.info("*** stopping service " + destination.getName());
-         
          Queue queue = ((ManagedQueue)destination).getQueue();
          
          String counterName = QUEUE_MESSAGECOUNTER_PREFIX + destination.getName();
@@ -176,8 +168,6 @@
          
          queue.deactivate();
          
-         log.info("**** deactivated queue");
-         
          queue.unload();
          
          started = false;

Modified: trunk/src/main/org/jboss/jms/server/destination/TopicService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/TopicService.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/jms/server/destination/TopicService.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -65,15 +65,11 @@
       try
       {
          PostOffice po = serverPeer.getPostOfficeInstance();
-         
-         log.info("*** deploying topic " + destination.getName());
-                    
+                
          // We deploy any queues corresponding to pre-existing durable subscriptions
 
          Collection queues = po.getQueuesForCondition(new JMSCondition(false, destination.getName()), true);
       	
-         log.info("Got " + queues.size() + " queues");
-         
          Iterator iter = queues.iterator();
          while (iter.hasNext())
          {
@@ -85,7 +81,6 @@
             
             queue.setPreserveOrdering(serverPeer.isDefaultPreserveOrdering());
             
-            log.info("**** loading queue");
             queue.load();
                         
             queue.activate();  

Modified: trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -44,8 +44,7 @@
  * 
  * This class handles connections to other nodes that are used to pull messages from remote queues to local queues
  * 
- * TODO - Throttling - we should send a stop message if the local queue is getting full
- * 
+ *
  * TODO - clean closing of suckers
  * 
  * 

Modified: trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -103,8 +103,6 @@
 		
 		if (trace) { log.trace(this + " starting"); }
 		
-		//Only support non XA for now
-		
 		if (!xa)
 		{
 			//If not XA then we use a client ack session for consuming - this allows us to get the message, send it to the destination

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -465,7 +465,7 @@
 
       public void run()
       {
-         log.info(this  + " got new view " + newView);
+         log.debug(this  + " got new view " + newView);
 
          // JGroups will make sure this method is never called by more than one thread concurrently
 

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-06-25 22:28:37 UTC (rev 2798)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-06-25 23:03:21 UTC (rev 2799)
@@ -1337,7 +1337,7 @@
          		{
          			//Local queue
 
-         			//TODO - There is a temporary hack here -
+         			//TODO - There is a slight kludge here -
          			//When routing to a clustered temp queue, the queue is unreliable - but we always want to route to the local
          			//one so we need to add the check that we only route remotely if it's a topic
          			//We could do this better by making sure that only one queue with the same name is routed to on the cluster
@@ -1406,11 +1406,7 @@
          			
          			multicastRequest(request);
          		}
-         	}
-         	else
-         	{
-         		log.info("************** &&&&&&&&&& not multicasting");
-         	}
+         	}   
          	
          	//If the ref is reliable and there is more than one reliable local queue that accepts the message then we need
          	//to route in a transaction to guarantee once and only once reliability guarantee




More information about the jboss-cvs-commits mailing list