You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ru...@apache.org on 2007/11/09 11:26:25 UTC
svn commit: r593481 - in /incubator/qpid/branches/M2.1/java/perftests: ./
etc/jndi/ etc/scripts/ src/main/java/org/apache/qpid/requestreply/
Author: rupertlssmith
Date: Fri Nov 9 02:26:25 2007
New Revision: 593481
URL: http://svn.apache.org/viewvc?rev=593481&view=rev
Log:
Updated perftests to use JMS/JNDI lookup. Added some options to support non-Qpid middleware.
Added:
incubator/qpid/branches/M2.1/java/perftests/etc/jndi/
incubator/qpid/branches/M2.1/java/perftests/etc/jndi/activemq.properties
incubator/qpid/branches/M2.1/java/perftests/etc/jndi/perftests.properties
incubator/qpid/branches/M2.1/java/perftests/etc/jndi/swiftmq.properties
incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-ActiveMQ.sh
incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-SwiftMQ.sh
Modified:
incubator/qpid/branches/M2.1/java/perftests/jar-with-dependencies.xml
incubator/qpid/branches/M2.1/java/perftests/pom.xml
incubator/qpid/branches/M2.1/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
Added: incubator/qpid/branches/M2.1/java/perftests/etc/jndi/activemq.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/etc/jndi/activemq.properties?rev=593481&view=auto
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/etc/jndi/activemq.properties (added)
+++ incubator/qpid/branches/M2.1/java/perftests/etc/jndi/activemq.properties Fri Nov 9 02:26:25 2007
@@ -0,0 +1,3 @@
+java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url= tcp://localhost:61616
+
Added: incubator/qpid/branches/M2.1/java/perftests/etc/jndi/perftests.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/etc/jndi/perftests.properties?rev=593481&view=auto
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/etc/jndi/perftests.properties (added)
+++ incubator/qpid/branches/M2.1/java/perftests/etc/jndi/perftests.properties Fri Nov 9 02:26:25 2007
@@ -0,0 +1,2 @@
+java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory
+connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
Added: incubator/qpid/branches/M2.1/java/perftests/etc/jndi/swiftmq.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/etc/jndi/swiftmq.properties?rev=593481&view=auto
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/etc/jndi/swiftmq.properties (added)
+++ incubator/qpid/branches/M2.1/java/perftests/etc/jndi/swiftmq.properties Fri Nov 9 02:26:25 2007
@@ -0,0 +1,3 @@
+java.naming.factory.initial = com.swiftmq.jndi.InitialContextFactoryImpl
+java.naming.provider.url=smqp://localhost:4001/timeout=10000
+#connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
Added: incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-ActiveMQ.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-ActiveMQ.sh?rev=593481&view=auto
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-ActiveMQ.sh (added)
+++ incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-ActiveMQ.sh Fri Nov 9 02:26:25 2007
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Parse arguements taking all - prefixed args as JAVA_OPTS
+for arg in "$@"; do
+ if [[ $arg == -java:* ]]; then
+ JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2` "
+ else
+ ARGS="${ARGS}$arg "
+ fi
+done
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;activemq-jars/apache-activemq-4.1.1.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-ActiveMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=activemq.properties factoryName=ConnectionFactory ${ARGS}
+
+# queueNamePostfix=@router1 overrideClientId=true
\ No newline at end of file
Added: incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-SwiftMQ.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-SwiftMQ.sh?rev=593481&view=auto
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-SwiftMQ.sh (added)
+++ incubator/qpid/branches/M2.1/java/perftests/etc/scripts/Test-SwiftMQ.sh Fri Nov 9 02:26:25 2007
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Parse arguements taking all - prefixed args as JAVA_OPTS
+for arg in "$@"; do
+ if [[ $arg == -java:* ]]; then
+ JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2` "
+ else
+ ARGS="${ARGS}$arg "
+ fi
+done
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;swiftmqjars/swiftmq.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-SwiftMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=swiftmq.properties factoryName=ConnectionFactory queueNamePostfix=@router1 overrideClientId=true ${ARGS}
\ No newline at end of file
Modified: incubator/qpid/branches/M2.1/java/perftests/jar-with-dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/jar-with-dependencies.xml?rev=593481&r1=593480&r2=593481&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/jar-with-dependencies.xml (original)
+++ incubator/qpid/branches/M2.1/java/perftests/jar-with-dependencies.xml Fri Nov 9 02:26:25 2007
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+ -
http://www.apache.org/licenses/LICENSE-2.0
-
+ -
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,21 +44,30 @@
<outputDirectory></outputDirectory>
</fileSet>
- <!-- Include all the test scripts, both generated and hand-written. -->
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>etc/scripts</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
+ <!-- Include all the test scripts, both generated and hand-written. -->
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>etc/scripts</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+
+ <!-- Include all jndi configurations needed to run the tests. -->
+ <fileSet>
+ <directory>etc/jndi</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
<!-- Include the build artifact. -->
<fileSet>
Modified: incubator/qpid/branches/M2.1/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/pom.xml?rev=593481&r1=593480&r2=593481&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/pom.xml (original)
+++ incubator/qpid/branches/M2.1/java/perftests/pom.xml Fri Nov 9 02:26:25 2007
@@ -351,13 +351,13 @@
<TQBT-TX-Qpid-01>-n TQBT-TX-Qpid-01 -d10M -s[1000] -c[16] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false uniqueDests=true numConsumers=1 transacted=true consTransacted=true consAckMode=0 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </TQBT-TX-Qpid-01>
<TQBT-AA-Qpid-01>-n TQBT-AA-Qpid-01 -d10M -s[1000] -c[16] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false uniqueDests=true numConsumers=1 transacted=false consTransacted=false consAckMode=1 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </TQBT-AA-Qpid-01>
<TQBT-NA-Qpid-01>-n TQBT-NA-Qpid-01 -d10M -s[1000] -c[16] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false uniqueDests=true numConsumers=1 transacted=false consTransacted=false consAckMode=257 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </TQBT-NA-Qpid-01>
- <TTBT-TX-Qpid-01>-n TTBT-TX-Qpid-01 -d10M -s[1000] -c[2] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true uniqueDests=false numConsumers=8 transacted=true consTransacted=true consAckMode=0 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </TTBT-TX-Qpid-01>
+ <TTBT-TX-Qpid-01>-n TTBT-TX-Qpid-01 -d10M -s[1000] -c[2] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true uniqueDests=false numConsumers=8 transacted=true consTransacted=false consAckMode=1 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </TTBT-TX-Qpid-01>
<TTBT-AA-Qpid-01>-n TTBT-AA-Qpid-01 -d10M -s[1000] -c[2] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true uniqueDests=false numConsumers=8 transacted=false consTransacted=false consAckMode=1 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </TTBT-AA-Qpid-01>
<TTBT-NA-Qpid-01>-n TTBT-NA-Qpid-01 -d10M -s[1000] -c[2] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true uniqueDests=false numConsumers=8 transacted=false consTransacted=false consAckMode=257 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </TTBT-NA-Qpid-01>
<PQBT-TX-Qpid-01>-n PQBT-TX-Qpid-01 -d10M -s[1000] -c[16] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true pubsub=false uniqueDests=true numConsumers=1 transacted=true consTransacted=true consAckMode=0 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </PQBT-TX-Qpid-01>
<PQBT-AA-Qpid-01>-n PQBT-AA-Qpid-01 -d10M -s[1000] -c[16] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true pubsub=false uniqueDests=true numConsumers=1 transacted=false consTransacted=false consAckMode=1 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </PQBT-AA-Qpid-01>
- <PTBT-TX-Qpid-01>-n PTBT-TX-Qpid-01 -d10M -s[1000] -c[2] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true pubsub=true uniqueDests=false numConsumers=8 transacted=true consTransacted=true consAckMode=0 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </PTBT-TX-Qpid-01>
+ <PTBT-TX-Qpid-01>-n PTBT-TX-Qpid-01 -d10M -s[1000] -c[2] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true pubsub=true uniqueDests=false numConsumers=8 transacted=true consTransacted=false consAckMode=1 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </PTBT-TX-Qpid-01>
<PTBT-AA-Qpid-01>-n PTBT-AA-Qpid-01 -d10M -s[1000] -c[2] -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true pubsub=true uniqueDests=false numConsumers=8 transacted=false consTransacted=false consAckMode=1 commitBatchSize=1 batchSize=1000 messageSize=256 destinationCount=1 rate=0 maxPending=2000000 </PTBT-AA-Qpid-01>
<!-- Job Queueing. 1:10 -->
Modified: incubator/qpid/branches/M2.1/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java?rev=593481&r1=593480&r2=593481&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java (original)
+++ incubator/qpid/branches/M2.1/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java Fri Nov 9 02:26:25 2007
@@ -23,24 +23,19 @@
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.*;
-import org.apache.qpid.client.message.AMQMessage;
-import org.apache.qpid.client.message.TestMessageFactory;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.jms.MessageProducer;
-import org.apache.qpid.jms.Session;
-import org.apache.qpid.url.URLSyntaxException;
-import org.apache.qpid.util.CommandLineParser;
+import org.apache.qpid.test.framework.TestUtils;
import uk.co.thebadgerset.junit.extensions.BatchedThrottle;
import uk.co.thebadgerset.junit.extensions.Throttle;
+import uk.co.thebadgerset.junit.extensions.util.CommandLineParser;
import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
import javax.jms.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
-import java.io.IOException;
+import java.io.*;
import java.net.InetAddress;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -126,11 +121,29 @@
* message waits until all other messages have been handled before releasing producers but allows messages to be
* processed concurrently, unlike the current synchronized block.
*/
-public class PingPongProducer implements Runnable /*, MessageListener*/, ExceptionListener
+public class PingPongProducer implements Runnable, ExceptionListener
{
/** Used for debugging. */
private static final Logger log = Logger.getLogger(PingPongProducer.class);
+ /** Holds the name of the property to determine whether of not client id is overridden at connection time. */
+ public static final String OVERRIDE_CLIENT_ID_PROPNAME = "overrideClientId";
+
+ /** Holds the default value of the override client id flag. */
+ public static final String OVERRIDE_CLIENT_ID_DEAFULT = "false";
+
+ /** Holds the name of the property to define the JNDI factory name with. */
+ public static final String FACTORY_NAME_PROPNAME = "factoryName";
+
+ /** Holds the default JNDI name of the connection factory. */
+ public static final String FACTORY_NAME_DEAFULT = "local";
+
+ /** Holds the name of the property to set the JNDI initial context properties with. */
+ public static final String FILE_PROPERTIES_PROPNAME = "properties";
+
+ /** Holds the default file name of the JNDI initial context properties. */
+ public static final String FILE_PROPERTIES_DEAFULT = "perftests.properties";
+
/** Holds the name of the property to get the test message size from. */
public static final String MESSAGE_SIZE_PROPNAME = "messageSize";
@@ -143,6 +156,12 @@
/** Holds the name of the default destination to send pings on. */
public static final String PING_QUEUE_NAME_DEFAULT = "ping";
+ /** Holds the name of the property to get the queue name postfix from. */
+ public static final String QUEUE_NAME_POSTFIX_PROPNAME = "queueNamePostfix";
+
+ /** Holds the default queue name postfix value. */
+ public static final String QUEUE_NAME_POSTFIX_DEFAULT = "";
+
/** Holds the name of the property to get the test delivery mode from. */
public static final String PERSISTENT_MODE_PROPNAME = "persistent";
@@ -310,11 +329,15 @@
static
{
+ defaults.setPropertyIfNull(OVERRIDE_CLIENT_ID_PROPNAME, OVERRIDE_CLIENT_ID_DEAFULT);
+ defaults.setPropertyIfNull(FILE_PROPERTIES_PROPNAME, FILE_PROPERTIES_DEAFULT);
+ defaults.setPropertyIfNull(FACTORY_NAME_PROPNAME, FACTORY_NAME_DEAFULT);
defaults.setPropertyIfNull(BROKER_PROPNAME, BROKER_DEFAULT);
defaults.setPropertyIfNull(USERNAME_PROPNAME, USERNAME_DEFAULT);
defaults.setPropertyIfNull(PASSWORD_PROPNAME, PASSWORD_DEFAULT);
defaults.setPropertyIfNull(VIRTUAL_HOST_PROPNAME, VIRTUAL_HOST_DEFAULT);
defaults.setPropertyIfNull(PING_QUEUE_NAME_PROPNAME, PING_QUEUE_NAME_DEFAULT);
+ defaults.setPropertyIfNull(QUEUE_NAME_POSTFIX_PROPNAME, QUEUE_NAME_POSTFIX_DEFAULT);
defaults.setPropertyIfNull(SELECTOR_PROPNAME, SELECTOR_DEFAULT);
defaults.setPropertyIfNull(TRANSACTED_PROPNAME, TRANSACTED_DEFAULT);
defaults.setPropertyIfNull(CONSUMER_TRANSACTED_PROPNAME, CONSUMER_TRANSACTED_DEFAULT);
@@ -339,6 +362,15 @@
defaults.setPropertyIfNull(MAX_PENDING_PROPNAME, MAX_PENDING_DEFAULT);
}
+ /** Allows setting of client ID on the connection, rather than through the connection URL. */
+ protected boolean _overrideClientId;
+
+ /** Holds the JNDI name of the JMS connection factory. */
+ protected String _factoryName;
+
+ /** Holds the name of the properties file to configure JNDI with. */
+ protected String _fileProperties;
+
/** Holds the broker url. */
protected String _brokerDetails;
@@ -354,6 +386,9 @@
/** Holds the root name from which to generate test destination names. */
protected String _destinationName;
+ /** Holds the default queue name postfix value. */
+ protected String _queueNamePostfix;
+
/** Holds the message selector to filter the pings with. */
protected String _selector;
@@ -523,11 +558,15 @@
properties.putAll(overrides);
// Extract the configuration properties to set the pinger up with.
+ _overrideClientId = properties.getPropertyAsBoolean(OVERRIDE_CLIENT_ID_PROPNAME);
+ _factoryName = properties.getProperty(FACTORY_NAME_PROPNAME);
+ _fileProperties = properties.getProperty(FILE_PROPERTIES_PROPNAME);
_brokerDetails = properties.getProperty(BROKER_PROPNAME);
_username = properties.getProperty(USERNAME_PROPNAME);
_password = properties.getProperty(PASSWORD_PROPNAME);
_virtualpath = properties.getProperty(VIRTUAL_HOST_PROPNAME);
_destinationName = properties.getProperty(PING_QUEUE_NAME_PROPNAME);
+ _queueNamePostfix = properties.getProperty(QUEUE_NAME_POSTFIX_PROPNAME);
_selector = properties.getProperty(SELECTOR_PROPNAME);
_transacted = properties.getPropertyAsBoolean(TRANSACTED_PROPNAME);
_consTransacted = properties.getPropertyAsBoolean(CONSUMER_TRANSACTED_PROPNAME);
@@ -582,19 +621,20 @@
// Generate a unique identifying name for this client, based on it ip address and the current time.
InetAddress address = InetAddress.getLocalHost();
- _clientID = address.getHostName() + System.currentTimeMillis();
+ // _clientID = address.getHostName() + System.currentTimeMillis();
+ _clientID = "perftest_" + instanceId;
// Create a connection to the broker.
createConnection(_clientID);
// Create transactional or non-transactional sessions, based on the command line arguments.
- _producerSession = (Session) _connection.createSession(_transacted, _ackMode);
+ _producerSession = _connection.createSession(_transacted, _ackMode);
_consumerSession = new Session[_noOfConsumers];
for (int i = 0; i < _noOfConsumers; i++)
{
- _consumerSession[i] = (Session) _consumerConnection[i].createSession(_consTransacted, _consAckMode);
+ _consumerSession[i] = _consumerConnection[i].createSession(_consTransacted, _consAckMode);
}
// Create the destinations to send pings to and receive replies from.
@@ -620,24 +660,37 @@
*
* @param clientID The clients identifier.
*
- * @throws AMQException Any underlying exceptions are allowed to fall through.
- * @throws URLSyntaxException Any underlying exceptions are allowed to fall through.
+ * @throws JMSException Underlying exceptions allowed to fall through.
+ * @throws NamingException Underlying exceptions allowed to fall through.
+ * @throws IOException Underlying exceptions allowed to fall through.
*/
- protected void createConnection(String clientID) throws AMQException, URLSyntaxException
+ protected void createConnection(String clientID) throws JMSException, NamingException, IOException
{
- // log.debug("protected void createConnection(String clientID = " + clientID + "): called");
+ // _log.debug("protected void createConnection(String clientID = " + clientID + "): called");
+
+ // _log.debug("Creating a connection for the message producer.");
+ File propsFile = new File(_fileProperties);
+ InputStream is = new FileInputStream(propsFile);
+ Properties properties = new Properties();
+ properties.load(is);
- // log.debug("Creating a connection for the message producer.");
+ Context context = new InitialContext(properties);
+ ConnectionFactory factory = (ConnectionFactory) context.lookup(_factoryName);
+ _connection = factory.createConnection(_username, _password);
- _connection = new AMQConnection(_brokerDetails, _username, _password, clientID, _virtualpath);
+ if (_overrideClientId)
+ {
+ _connection.setClientID(clientID);
+ }
- // log.debug("Creating " + _noOfConsumers + " connections for the consumers.");
+ // _log.debug("Creating " + _noOfConsumers + " connections for the consumers.");
_consumerConnection = new Connection[_noOfConsumers];
for (int i = 0; i < _noOfConsumers; i++)
{
- _consumerConnection[i] = new AMQConnection(_brokerDetails, _username, _password, clientID, _virtualpath);
+ _consumerConnection[i] = factory.createConnection(_username, _password);
+ // _consumerConnection[i].setClientID(clientID);
}
}
@@ -744,10 +797,9 @@
* @param durable If the destinations are durable topics.
*
* @throws JMSException Any JMSExceptions are allowed to fall through.
- * @throws AMQException Any AMQExceptions are allowed to fall through.
*/
public void createPingDestinations(int noOfDestinations, String selector, String rootName, boolean unique,
- boolean durable) throws JMSException, AMQException
+ boolean durable) throws JMSException
{
/*log.debug("public void createPingDestinations(int noOfDestinations = " + noOfDestinations + ", String selector = "
+ selector + ", String rootName = " + rootName + ", boolean unique = " + unique + ", boolean durable = "
@@ -760,8 +812,7 @@
for (int i = 0; i < noOfDestinations; i++)
{
- AMQDestination destination;
-
+ Destination destination;
String id;
// Generate an id, unique within this pinger or to the whole JVM depending on the unique flag.
@@ -779,30 +830,18 @@
// Check if this is a pub/sub pinger, in which case create topics.
if (_isPubSub)
{
- if (!durable)
- {
- destination = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, rootName + id);
- // log.debug("Created non-durable topic " + destination);
- }
- else
+ destination = _producerSession.createTopic(rootName + id);
+ // log.debug("Created non-durable topic " + destination);
+
+ if (durable)
{
- destination =
- AMQTopic.createDurableTopic(new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, rootName + id),
- _clientID, (AMQConnection) _connection);
- // log.debug("Created durable topic " + destination);
+ _producerSession.createDurableSubscriber((Topic) destination, _connection.getClientID());
}
}
// Otherwise this is a p2p pinger, in which case create queues.
else
{
- AMQShortString destinationName = new AMQShortString(rootName + id);
- destination =
- new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, destinationName, destinationName, false, false,
- _isDurable);
- ((AMQSession) _producerSession).createQueue(destinationName, false, _isDurable, false);
- ((AMQSession) _producerSession).bindQueue(destinationName, destinationName, null,
- ExchangeDefaults.DIRECT_EXCHANGE_NAME);
-
+ destination = _producerSession.createQueue(rootName + id + _queueNamePostfix);
// log.debug("Created queue " + destination);
}
@@ -835,9 +874,7 @@
for (int i = 0; i < _noOfConsumers; i++)
{
// Create a consumer for the destination and set this pinger to listen to its messages.
- _consumer[i] =
- _consumerSession[i].createConsumer(destination, PREFETCH_DEFAULT, NO_LOCAL_DEFAULT, EXCLUSIVE_DEFAULT,
- selector);
+ _consumer[i] = _consumerSession[i].createConsumer(destination, selector, NO_LOCAL_DEFAULT);
final int consumerNo = i;
@@ -1374,7 +1411,8 @@
*/
public Message getTestMessage(Destination replyQueue, int messageSize, boolean persistent) throws JMSException
{
- return TestMessageFactory.newObjectMessage(_producerSession, replyQueue, messageSize, persistent);
+ // return TestMessageFactory.newObjectMessage(_producerSession, replyQueue, messageSize, persistent);
+ return TestUtils.createTestMessageOfSize(_producerSession, messageSize);
}
/**
@@ -1386,14 +1424,14 @@
*/
protected void setTimestamp(Message msg) throws JMSException
{
- if (((AMQSession) _producerSession).isStrictAMQP())
+ /*if (((AMQSession)_producerSession).isStrictAMQP())
{
- ((AMQMessage) msg).setTimestampProperty(new AMQShortString(MESSAGE_TIMESTAMP_PROPNAME), System.nanoTime());
+ ((AMQMessage)msg).setTimestampProperty(new AMQShortString(MESSAGE_TIMESTAMP_PROPNAME), System.nanoTime());
}
else
- {
- msg.setLongProperty(MESSAGE_TIMESTAMP_PROPNAME, System.nanoTime());
- }
+ {*/
+ msg.setLongProperty(MESSAGE_TIMESTAMP_PROPNAME, System.nanoTime());
+ // }
}
/**
@@ -1407,16 +1445,16 @@
*/
protected long getTimestamp(Message msg) throws JMSException
{
- if (((AMQSession) _producerSession).isStrictAMQP())
+ /*if (((AMQSession)_producerSession).isStrictAMQP())
{
- Long value = ((AMQMessage) msg).getTimestampProperty(new AMQShortString(MESSAGE_TIMESTAMP_PROPNAME));
+ Long value = ((AMQMessage)msg).getTimestampProperty(new AMQShortString(MESSAGE_TIMESTAMP_PROPNAME));
return (value == null) ? 0L : value;
}
else
- {
- return msg.getLongProperty(PingPongProducer.MESSAGE_TIMESTAMP_PROPNAME);
- }
+ {*/
+ return msg.getLongProperty(PingPongProducer.MESSAGE_TIMESTAMP_PROPNAME);
+ // }
}
/**
@@ -1576,12 +1614,6 @@
catch (JMSException e)
{
// log.debug("JMSException on commit:" + e.getMessage(), e);
-
- // Warn that the bounce back client is not available.
- if (e.getLinkedException() instanceof AMQNoConsumersException)
- {
- // log.debug("No consumers on queue.");
- }
try
{