QPID-278

broker distribution - modified to allow assembly:directory builds
broker/pom.xml - moved slf4j to common/pom.xml

QPID-283
Provided better feedback from shell scripts.
Provided QuickTest shell script that runs the RequestReply tests.
perftests distribution - modified to allow assembly:directory builds

Moved Resource Readme content relating to Tests to RunningPerformanceTests.txt

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495554 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 62 insertions, 28 deletions

diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceProvidingClient.java b/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceProvidingClient.java
index 66950ddf3e..00528c3a5d 100644
--- a/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceProvidingClient.java
+++ b/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceProvidingClient.java
@@ -49,13 +49,13 @@ public class ServiceProvidingClient
 
     public ServiceProvidingClient(String brokerDetails, String username, String password,
                                   String clientName, String virtualPath, String serviceName,
-								  String deliveryModeString, String transactedMode)
+                                  final int deliveryMode, boolean transactedMode, String selector)
             throws AMQException, JMSException, URLSyntaxException
     {
-		final int deliveryMode = deliveryModeString.toUpperCase().charAt(0) == 'P' ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT;
-		_isTransactional = transactedMode.toUpperCase().charAt(0) == 'T' ? true : false;
+        _isTransactional = transactedMode;
 
-        _logger.info("Delivery Mode: " + deliveryMode + "\t isTransactional: " + _isTransactional);
+        _logger.info("Delivery Mode: " + (deliveryMode == DeliveryMode.NON_PERSISTENT ? "Non Persistent" : "Persistent")
+                     + "\t isTransactional: " + _isTransactional);
 
         _connection = new AMQConnection(brokerDetails, username, password,
                                         clientName, virtualPath);
@@ -93,7 +93,7 @@ public class ServiceProvidingClient
         AMQQueue destination = new AMQQueue(serviceName);
 
         MessageConsumer consumer = _session.createConsumer(destination,
-                                                          100, true, false, null);
+                                                           100, true, false, selector);
 
         consumer.setMessageListener(new MessageListener()
         {
@@ -153,11 +153,11 @@ public class ServiceProvidingClient
                     
                     _destinationProducer.send(msg);
 
-					if(_isTransactional)
+                    if (_isTransactional)
                     {
                         _producerSession.commit();
                     }
-                    if(_isTransactional)
+                    if (_isTransactional)
                     {
                         _session.commit();
                     }
@@ -184,10 +184,9 @@ public class ServiceProvidingClient
     {
         _logger.info("Starting...");
 
-        if (args.length < 7)
+        if (args.length < 5)
         {
-            System.out.println("Usage: <brokerDetails> <username> <password> <virtual-path> <serviceQueue>" +
-                               " <P[ersistent]|N[onPersistent]>  <T[ransacted]|N[onTransacted]> [selector]");
+            System.out.println("Usage: serviceProvidingClient <brokerDetails> <username> <password> <virtual-path> <serviceQueue> [<P[ersistent]|N[onPersistent]> <T[ransacted]|N[onTransacted]>] [selector]");
             System.exit(1);
         }
         String clientId = null;
@@ -201,10 +200,29 @@ public class ServiceProvidingClient
             _logger.error("Error: " + e, e);
         }
 
+
+        int deliveryMode = DeliveryMode.NON_PERSISTENT;
+        boolean transactedMode = false;
+
+        if (args.length > 7)
+        {
+            deliveryMode = args[args.length - 2].toUpperCase().charAt(0) == 'P' ? DeliveryMode.PERSISTENT
+                           : DeliveryMode.NON_PERSISTENT;
+
+            transactedMode = args[args.length - 1].toUpperCase().charAt(0) == 'T' ? true : false;
+        }
+
+        String selector = null;
+        if ((args.length == 8) || (args.length == 7))
+        {
+            selector = args[args.length - 1];
+        }
+
         try
         {
             ServiceProvidingClient client = new ServiceProvidingClient(args[0], args[1], args[2],
-                                                                       clientId, args[3], args[4], args[5], args[6]);
+                                                                       clientId, args[3], args[4],
+                                                                       deliveryMode, transactedMode, selector);
             client.run();
         }
         catch (JMSException e)
@@ -219,6 +237,8 @@ public class ServiceProvidingClient
         {
             _logger.error("Error: " + e, e);
         }
+
+
     }
 
 }
diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceRequestingClient.java b/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceRequestingClient.java
index de49124035..2c1c0ecff6 100644
--- a/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceRequestingClient.java
+++ b/java/perftests/src/main/java/org/apache/qpid/requestreply/ServiceRequestingClient.java
@@ -91,7 +91,7 @@ public class ServiceRequestingClient implements ExceptionListener
             }
             try
             {
-				m.getPropertyNames();
+                m.getPropertyNames();
                 if (m.propertyExists("timeSent"))
                 {
                     long timeSent = Long.parseLong(m.getStringProperty("timeSent"));
@@ -162,15 +162,13 @@ public class ServiceRequestingClient implements ExceptionListener
 
     public ServiceRequestingClient(String brokerHosts, String clientID, String username, String password,
                                    String vpath, String commandQueueName,
-								   String deliveryModeString, String transactedMode,
+                                   int deliveryMode, boolean transactedMode,
                                    final int messageCount, final int messageDataLength) throws AMQException, URLSyntaxException
     {
-		final int deliveryMode = deliveryModeString.toUpperCase().charAt(0) == 'P' ? DeliveryMode.PERSISTENT
-																			   : DeliveryMode.NON_PERSISTENT;
+        _isTransactional = transactedMode;
 
-		_isTransactional = transactedMode.toUpperCase().charAt(0) == 'T' ? true : false;
-
-        _log.info("Delivery Mode: " + deliveryMode + "\t isTransactional: " + _isTransactional);
+        _log.info("Delivery Mode: " + (deliveryMode == DeliveryMode.NON_PERSISTENT ? "Non Persistent" : "Persistent") +
+                  "\t isTransactional: " + _isTransactional);
 
         _messageCount = messageCount;
         MESSAGE_DATA = TestMessageFactory.createMessagePayload(messageDataLength);
@@ -198,7 +196,7 @@ public class ServiceRequestingClient implements ExceptionListener
             TextMessage first = _session.createTextMessage(MESSAGE_DATA);
             first.setJMSReplyTo(_tempDestination);
             send(first);
-			if(_isTransactional)
+            if (_isTransactional)
             {
                 _producerSession.commit();
             }
@@ -248,7 +246,7 @@ public class ServiceRequestingClient implements ExceptionListener
                 msg.setLongProperty("timeSent", timeNow);
             }
             send(msg);
-            if(_isTransactional)
+            if (_isTransactional)
             {
                 _producerSession.commit();
             }
@@ -275,22 +273,36 @@ public class ServiceRequestingClient implements ExceptionListener
      */
     public static void main(String[] args)
     {
-        if (args.length < 9)
+        if (args.length < 6)
         {
-            System.err.println("Usage: ServiceRequestingClient <brokerDetails - semicolon separated host:port list>" +
-                               " <username> <password> <vpath> <command queue name> <P[ersistent]|N[onPersistent]>" +
-                               " <T[ransacted]|N[onTransacted]> <number of messages> <message size>");
+            System.err.println(
+                    "Usage: ServiceRequestingClient <brokerDetails> <username> <password> <vpath> <command queue name> <number of messages> [<message size>] [<P[ersistent]|N[onPersistent] (Default N)>  <T[ransacted]|N[onTransacted] (Default N)>]");
             System.exit(1);
         }
         try
         {
-            int messageDataLength = args.length > 8 ? Integer.parseInt(args[8]) : 4096;
+            int messageSize = 4096;
+            boolean transactedMode = false;
+            int deliveryMode = DeliveryMode.NON_PERSISTENT;
+
+            if (args.length > 7)
+            {
+                deliveryMode = args[args.length - 2].toUpperCase().charAt(0) == 'P' ? DeliveryMode.PERSISTENT
+                               : DeliveryMode.NON_PERSISTENT;
+
+                transactedMode = args[args.length - 1].toUpperCase().charAt(0) == 'T' ? true : false;
+            }
+
+            if ((args.length == 9) ||(args.length == 7))
+            {
+                messageSize = Integer.parseInt(args[6]);
+            }          
 
             InetAddress address = InetAddress.getLocalHost();
             String clientID = address.getHostName() + System.currentTimeMillis();
             ServiceRequestingClient client = new ServiceRequestingClient(args[0], clientID, args[1], args[2], args[3],
-                                                                         args[4], args[5], args[6], Integer.parseInt(args[7]),
-                                                                         messageDataLength);
+                                                                         args[4], deliveryMode, transactedMode, Integer.parseInt(args[5]),
+                                                                         messageSize);
             Object waiter = new Object();
             client.run(waiter);
             synchronized (waiter)
diff --git a/java/perftests/src/main/java/perftests.log4j b/java/perftests/src/main/java/perftests.log4j
index e15cb9b285..5410f9ecd2 100644
--- a/java/perftests/src/main/java/perftests.log4j
+++ b/java/perftests/src/main/java/perftests.log4j
@@ -28,7 +28,9 @@ log4j.logger.org.apache.qpid.pingpong=${amqj.test.logging.level}
 log4j.appender.console=org.apache.log4j.ConsoleAppender

 log4j.appender.console.Threshold=all

 log4j.appender.console.layout=org.apache.log4j.PatternLayout

-log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n

+

+#log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n

+log4j.appender.console.layout.ConversionPattern=[%c] %m%n

 

 log4j.appender.fileApp=org.apache.log4j.FileAppender

 log4j.appender.fileApp.file=${log.dir}/perftests.volumetest.log