Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9BB110DF1 for ; Mon, 21 Dec 2015 13:23:01 +0000 (UTC) Received: (qmail 57135 invoked by uid 500); 21 Dec 2015 13:23:01 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 57105 invoked by uid 500); 21 Dec 2015 13:23:01 -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 57096 invoked by uid 99); 21 Dec 2015 13:23:01 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Dec 2015 13:23:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E0EFE1A00D6 for ; Mon, 21 Dec 2015 13:23:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id riHRJ0f4tgEw for ; Mon, 21 Dec 2015 13:22:54 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id 6B7B920FD3 for ; Mon, 21 Dec 2015 13:22:54 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id D00C7E0428 for ; Mon, 21 Dec 2015 13:22:53 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id AA8903A0051 for ; Mon, 21 Dec 2015 13:22:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1721149 - in /qpid/java/trunk/perftests: etc/perftests-jndi.properties src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java Date: Mon, 21 Dec 2015 13:22:53 -0000 To: commits@qpid.apache.org From: kwall@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151221132253.AA8903A0051@svn01-us-west.apache.org> Author: kwall Date: Mon Dec 21 13:22:53 2015 New Revision: 1721149 URL: http://svn.apache.org/viewvc?rev=1721149&view=rev Log: NO-JIRA: [Java Perf Tests] Have perftests record protocol version when testing with an AMQP 1.0 client Modified: qpid/java/trunk/perftests/etc/perftests-jndi.properties qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java Modified: qpid/java/trunk/perftests/etc/perftests-jndi.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/etc/perftests-jndi.properties?rev=1721149&r1=1721148&r2=1721149&view=diff ============================================================================== --- qpid/java/trunk/perftests/etc/perftests-jndi.properties (original) +++ qpid/java/trunk/perftests/etc/perftests-jndi.properties Mon Dec 21 13:22:53 2015 @@ -22,7 +22,7 @@ perftestResultsDirectory=perftestResults connectionfactory.connectionfactory = amqp://guest:guest@clientid/?brokerlist='${brokerHostPortPlain}' connectionfactory.sslconnectionfactory = amqp://guest:guest@clientid/?ssl='true'&brokerlist='${brokerHostPortSsl}' -destination.controllerqueue = direct://amq.direct//controllerqueue?autodelete='true' +queue.controllerqueue = controllerqueue jdbcDriverClass=org.apache.derby.jdbc.EmbeddedDriver # writes to a results database in ./perftestResultsDb by default. Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java?rev=1721149&r1=1721148&r2=1721149&view=diff ============================================================================== --- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java (original) +++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java Mon Dec 21 13:22:53 2015 @@ -818,6 +818,19 @@ public class ClientJmsDelegate } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + try + { + ConnectionMetaData metaData = connection.getMetaData(); + if (metaData != null && ("QpidJMS".equals(metaData.getJMSProviderName()) || + "AMQP.ORG".equals(metaData.getJMSProviderName()))) + { + return "1.0"; + } + } + catch (JMSException e1) + { + return null; + } return null; } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org