Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 95019 invoked from network); 4 Mar 2010 11:20:20 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Mar 2010 11:20:20 -0000 Received: (qmail 47849 invoked by uid 500); 4 Mar 2010 11:20:09 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 47833 invoked by uid 500); 4 Mar 2010 11:20:09 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 47826 invoked by uid 99); 4 Mar 2010 11:20:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Mar 2010 11:20:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Mar 2010 11:20:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 09D562388A29; Thu, 4 Mar 2010 11:19:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r918944 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid: qmf/ server/configuration/ server/federation/ server/protocol/ Date: Thu, 04 Mar 2010 11:19:46 -0000 To: commits@qpid.apache.org From: robbie@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100304111947.09D562388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: robbie Date: Thu Mar 4 11:19:46 2010 New Revision: 918944 URL: http://svn.apache.org/viewvc?rev=918944&view=rev Log: QPID-2379: defer getShadow property to ConnectionConfig objects instead of hardcoding in the delegate Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java?rev=918944&r1=918943&r2=918944&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java Thu Mar 4 11:19:46 2010 @@ -1230,11 +1230,9 @@ return _obj.getCreateTime(); } - @Override public Boolean getShadow() { - // TODO Auto-generated method stub - return false; + return _obj.isShadow(); } } Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java?rev=918944&r1=918943&r2=918944&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java Thu Mar 4 11:19:46 2010 @@ -42,4 +42,6 @@ Integer getRemoteParentPID(); ConfigStore getConfigStore(); + + Boolean isShadow(); } \ No newline at end of file Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java?rev=918944&r1=918943&r2=918944&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java Thu Mar 4 11:19:46 2010 @@ -183,6 +183,11 @@ { return _adapterCreateTime; } + + public Boolean isShadow() + { + return false; + } } private class SessionFactory implements Connection.SessionFactory Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=918944&r1=918943&r2=918944&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java Thu Mar 4 11:19:46 2010 @@ -1139,4 +1139,9 @@ return _createTime; } + public Boolean isShadow() + { + return false; + } + } Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java?rev=918944&r1=918943&r2=918944&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java Thu Mar 4 11:19:46 2010 @@ -183,4 +183,9 @@ { return _createTime; } + + public Boolean isShadow() + { + return false; + } } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org