From activemq-commits-return-100-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org Wed Dec 21 20:44:20 2005 Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 80205 invoked from network); 21 Dec 2005 20:44:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Dec 2005 20:44:20 -0000 Received: (qmail 26414 invoked by uid 500); 21 Dec 2005 20:44:20 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 26401 invoked by uid 500); 21 Dec 2005 20:44:19 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 26392 invoked by uid 99); 21 Dec 2005 20:44:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2005 12:44:19 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 21 Dec 2005 12:44:18 -0800 Received: (qmail 80108 invoked by uid 65534); 21 Dec 2005 20:43:58 -0000 Message-ID: <20051221204358.80107.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358371 - in /incubator/activemq/trunk/activemq-core/src/main/java/org/activemq: ./ pool/ Date: Wed, 21 Dec 2005 20:43:56 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Wed Dec 21 12:43:50 2005 New Revision: 358371 URL: http://svn.apache.org/viewcvs?rev=358371&view=rev Log: Fixed: https://jira.logicblaze.com/jira/browse/AMQ-426 JMS api object now implement a toString() that can be used to correlate back to log messages on the message broker. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledSession.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java Wed Dec 21 12:43:50 2005 @@ -1542,4 +1542,8 @@ public void setCopyMessageOnSend(boolean copyMessageOnSend) { this.copyMessageOnSend = copyMessageOnSend; } + + public String toString() { + return "ActiveMQConnection {id="+info.getConnectionId()+",clientId"+info.getClientId()+",started="+started.get()+"}"; + } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java Wed Dec 21 12:43:50 2005 @@ -148,4 +148,8 @@ connection.onAsyncException(e); } } + + public String toString() { + return "ActiveMQConnectionConsumer { consumerId=" +consumerInfo.getConsumerId()+" }"; + } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java Wed Dec 21 12:43:50 2005 @@ -227,4 +227,8 @@ unconsumedMessages.enqueue(md); } + public String toString() { + return "ActiveMQInputStream { consumerId="+info.getConsumerId()+", producerId=" +producerId+" }"; + } + } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java Wed Dec 21 12:43:50 2005 @@ -727,5 +727,9 @@ started.set(false); unconsumedMessages.stop(); } + + public String toString() { + return "ActiveMQMessageConsumer { consumerId=" +info.getConsumerId()+", started=" +started.get()+" }"; + } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java Wed Dec 21 12:43:50 2005 @@ -500,4 +500,8 @@ this.info = info; } + public String toString() { + return "ActiveMQMessageProducer { consumerId=" +info.getProducerId()+" }"; + } + } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java Wed Dec 21 12:43:50 2005 @@ -155,4 +155,8 @@ connection.send(info.getDestination(), msg, id, deliveryMode, priority, timeToLive, !eosMessage); } + public String toString() { + return "ActiveMQOutputStream { producerId=" +info.getProducerId()+" }"; + } + } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java Wed Dec 21 12:43:50 2005 @@ -242,4 +242,9 @@ semaphore.notifyAll(); } } + + public String toString() { + return "ActiveMQQueueBrowser { consumerId=" +consumerId+" }"; + } + } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java Wed Dec 21 12:43:50 2005 @@ -86,4 +86,5 @@ checkClosed(); return (Queue) super.getDestination(); } + } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java Wed Dec 21 12:43:50 2005 @@ -1663,5 +1663,10 @@ public List getUnconsumedMessages() { return executor.getUnconsumedMessages(); } + + public String toString() { + return "ActiveMQSession {id="+info.getSessionId()+",started="+started.get()+"}"; + } + } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java Wed Dec 21 12:43:50 2005 @@ -142,5 +142,9 @@ protected ActiveMQSession createSession(SessionKey key) throws JMSException { return (ActiveMQSession) getConnection().createSession(key.isTransacted(), key.getAckMode()); } + + public String toString() { + return "PooledConnection { "+pool+" }"; + } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java Wed Dec 21 12:43:50 2005 @@ -126,4 +126,9 @@ protected ActiveMQMessageProducer getMessageProducer() { return messageProducer; } + + public String toString() { + return "PooledProducer { "+messageProducer+" }"; + } + } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledSession.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledSession.java?rev=358371&r1=358370&r2=358371&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledSession.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/pool/PooledSession.java Wed Dec 21 12:43:50 2005 @@ -280,4 +280,7 @@ return topicPublisher; } + public String toString() { + return "PooledSession { "+session+" }"; + } }