Updated Performance tests to use "." rather than "/" i.e. "amq.ConnectionFactory"

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

16 files changed, 34 insertions, 29 deletions

diff --git a/java/client/test/bin/IBM-JNDI-Setup.bat b/java/client/test/bin/IBM-JNDI-Setup.bat
index 72c0395014..c167398859 100644
--- a/java/client/test/bin/IBM-JNDI-Setup.bat
+++ b/java/client/test/bin/IBM-JNDI-Setup.bat
@@ -18,7 +18,7 @@
 REM Script to run the Qpid Java Broker

 

 set CMD="IBM-JNDI-Setup.bat"

-set JAVACLASS=org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory

+set JAVACLASS=

 

 rem Guess QPID_HOME if not defined

 set CURRENT_DIR=%cd%

@@ -52,7 +52,13 @@ goto exit
 set CLIENT_TEST_CLASSES=%QPID_HOME%\lib\client-test-launch.jar

 

 echo on

-"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%CLIENT_TEST_CLASSES%" %JAVACLASS%

+"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%CLIENT_TEST_CLASSES%" org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory

+"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%CLIENT_TEST_CLASSES%" org.apache.qpid.IBMPerfTest.JNDIBindQueue amq.Queue   direct://amq.direct//IBMPerfQueue1

+"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%CLIENT_TEST_CLASSES%" org.apache.qpid.IBMPerfTest.JNDIBindTopic amq.Topic1  topic://amq.topic/IBMPerfTopic1/

+"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%CLIENT_TEST_CLASSES%" org.apache.qpid.IBMPerfTest.JNDIBindTopic amq.Topic2  topic://amq.topic/IBMPerfTopic2/

+"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%CLIENT_TEST_CLASSES%" org.apache.qpid.IBMPerfTest.JNDIBindTopic amq.Topic3  topic://amq.topic/IBMPerfTopic3/

+

+

 

 :end

 

diff --git a/java/client/test/bin/IBM-JNDI-Setup.sh b/java/client/test/bin/IBM-JNDI-Setup.sh
index e27f062c13..b0f5cd0315 100755
--- a/java/client/test/bin/IBM-JNDI-Setup.sh
+++ b/java/client/test/bin/IBM-JNDI-Setup.sh
@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-qpid-run org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory
-qpid-run org.apache.qpid.IBMPerfTest.JNDIBindQueue amq/Queue   direct://amq.direct//IBMPerfQueue1
-qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq/Topic1  topic://amq.topic/IBMPerfTopic1/
-qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq/Topic2  topic://amq.topic/IBMPerfTopic2/
-qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq/Topic3  topic://amq.topic/IBMPerfTopic3/
-qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq/Topic4  topic://amq.topic/IBMPerfTopic4/
\ No newline at end of file
+qpid-run org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory amq.ConnectionFactorty
+qpid-run org.apache.qpid.IBMPerfTest.JNDIBindQueue amq.Queue   direct://amq.direct//IBMPerfQueue1
+qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq.Topic1  topic://amq.topic/IBMPerfTopic1/
+qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq.Topic2  topic://amq.topic/IBMPerfTopic2/
+qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq.Topic3  topic://amq.topic/IBMPerfTopic3/
+qpid-run org.apache.qpid.IBMPerfTest.JNDIBindTopic amq.Topic4  topic://amq.topic/IBMPerfTopic4/
\ No newline at end of file
diff --git a/java/client/test/bin/IBM-Publisher.bat b/java/client/test/bin/IBM-Publisher.bat
index fbff36e5b2..878ebd638a 100644
--- a/java/client/test/bin/IBM-Publisher.bat
+++ b/java/client/test/bin/IBM-Publisher.bat
@@ -18,7 +18,7 @@
 REM Script to run the Qpid Java Broker

 

 set CMD="IBM-Publisher.bat"

-set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory -d amq/Topic  -db 1 -dx 4 -tc jms.r11.Publisher -nt 4 %*

+set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory -d amq.Topic  -db 1 -dx 4 -tc jms.r11.Publisher -nt 4 %*

 

 rem Guess QPID_HOME if not defined

 set CURRENT_DIR=%cd%

diff --git a/java/client/test/bin/IBM-Publisher.sh b/java/client/test/bin/IBM-Publisher.sh
index 320b2c2804..c66c889e38 100755
--- a/java/client/test/bin/IBM-Publisher.sh
+++ b/java/client/test/bin/IBM-Publisher.sh
@@ -16,4 +16,4 @@
 #
 
 export MSGSIZE=100
-qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory -d amq/Topic  -db 1 -dx 4 -tc jms.r11.Publisher -nt 4 $*
\ No newline at end of file
+qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory -d amq.Topic  -db 1 -dx 4 -tc jms.r11.Publisher -nt 4 $*
\ No newline at end of file
diff --git a/java/client/test/bin/IBM-PutGet.bat b/java/client/test/bin/IBM-PutGet.bat
index f37a819147..8ae7376013 100644
--- a/java/client/test/bin/IBM-PutGet.bat
+++ b/java/client/test/bin/IBM-PutGet.bat
@@ -18,7 +18,7 @@
 REM Script to run the Qpid Java Broker

 

 set CMD="IBM-PutGet.bat"

-set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory  -d amq/Queue -tc jms.r11.PutGet -nt 6 %*

+set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory  -d amq.Queue -tc jms.r11.PutGet -nt 6 %*

 

 rem Guess QPID_HOME if not defined

 set CURRENT_DIR=%cd%

diff --git a/java/client/test/bin/IBM-PutGet.sh b/java/client/test/bin/IBM-PutGet.sh
index b44d7f3e6a..40492039a7 100755
--- a/java/client/test/bin/IBM-PutGet.sh
+++ b/java/client/test/bin/IBM-PutGet.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory  -d amq/Queue -tc jms.r11.PutGet -nt 6 $*
\ No newline at end of file
+qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory  -d amq.Queue -tc jms.r11.PutGet -nt 6 $*
\ No newline at end of file
diff --git a/java/client/test/bin/IBM-README.txt b/java/client/test/bin/IBM-README.txt
index 1d5b2fe96e..b076f3b3ca 100644
--- a/java/client/test/bin/IBM-README.txt
+++ b/java/client/test/bin/IBM-README.txt
@@ -3,6 +3,9 @@ The IBM JMS Performance Harness scripts have take the following additional param
 -tx : Enable transactions
 -pp : Enable persistent messaging
 
+-ms 1000 : Set message size (default 1000 bytes)
+-cc 1 : Number of messages to per commit (default 1) Only applies to Sender/Subscriber
+
 The IBM JMS Performance Harness will need to be downloaded and the library added to client/test/lib.
 
 The Library can be found here:
@@ -13,4 +16,4 @@ Before running the required test the IBM JNDI Setup script should be run.
 
 This will create a filesystem based JNDI Context located at:
 
-/temp/IBMPerfTestsJNDI/
\ No newline at end of file
+System.properties{java.io.tmpdir}/IBMPerfTestsJNDI/
\ No newline at end of file
diff --git a/java/client/test/bin/IBM-Receiver.bat b/java/client/test/bin/IBM-Receiver.bat
index 769406b374..4c0adc2dc7 100644
--- a/java/client/test/bin/IBM-Receiver.bat
+++ b/java/client/test/bin/IBM-Receiver.bat
@@ -18,7 +18,7 @@
 REM Script to run the Qpid Java Broker

 

 set CMD="IBM-Receiver.bat"

-set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory  -d amq/Queue -tc jms.r11.Receiver %*

+set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory  -d amq.Queue -tc jms.r11.Receiver %*

 

 rem Guess QPID_HOME if not defined

 set CURRENT_DIR=%cd%

diff --git a/java/client/test/bin/IBM-Receiver.sh b/java/client/test/bin/IBM-Receiver.sh
index 60ee3a9d98..896e1b2103 100755
--- a/java/client/test/bin/IBM-Receiver.sh
+++ b/java/client/test/bin/IBM-Receiver.sh
@@ -16,4 +16,4 @@
 #
 
 export MSGSIZE=100
-qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory  -d amq/Queue -tc jms.r11.Receiver $*
\ No newline at end of file
+qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory  -d amq.Queue -tc jms.r11.Receiver $*
\ No newline at end of file
diff --git a/java/client/test/bin/IBM-Sender.bat b/java/client/test/bin/IBM-Sender.bat
index 0fe295a93f..9887d34511 100644
--- a/java/client/test/bin/IBM-Sender.bat
+++ b/java/client/test/bin/IBM-Sender.bat
@@ -18,7 +18,7 @@
 REM Script to run the Qpid Java Broker

 

 set CMD="IBM-Sender.bat"

-set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory  -d amq/Queue -tc jms.r11.Sender -ms $MSGSIZE -mg 1000000 %*

+set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory  -d amq.Queue -tc jms.r11.Sender -ms $MSGSIZE -mg 1000000 %*

 

 rem Guess QPID_HOME if not defined

 set CURRENT_DIR=%cd%

diff --git a/java/client/test/bin/IBM-Sender.sh b/java/client/test/bin/IBM-Sender.sh
index 4e7d4880e3..3e8600ed81 100755
--- a/java/client/test/bin/IBM-Sender.sh
+++ b/java/client/test/bin/IBM-Sender.sh
@@ -16,4 +16,4 @@
 #
 
 export MSGSIZE=100
-qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory  -d amq/Queue -tc jms.r11.Sender -ms $MSGSIZE -mg 1000000  $*
\ No newline at end of file
+qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory  -d amq.Queue -tc jms.r11.Sender -ms $MSGSIZE -mg 1000000  $*
\ No newline at end of file
diff --git a/java/client/test/bin/IBM-Subscriber.bat b/java/client/test/bin/IBM-Subscriber.bat
index d231af943c..87cde15727 100644
--- a/java/client/test/bin/IBM-Subscriber.bat
+++ b/java/client/test/bin/IBM-Subscriber.bat
@@ -18,7 +18,7 @@
 REM Script to run the Qpid Java Broker

 

 set CMD="IBM-Subscriber.bat"

-set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory -d amq/Topic  -db 1 -dx 4 -tc jms.r11.Subscriber -nt 4 %*

+set JAVACLASS=JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory -d amq.Topic  -db 1 -dx 4 -tc jms.r11.Subscriber -nt 4 %*

 

 rem Guess QPID_HOME if not defined

 set CURRENT_DIR=%cd%

diff --git a/java/client/test/bin/IBM-Subscriber.sh b/java/client/test/bin/IBM-Subscriber.sh
index d12955254b..57a4969146 100755
--- a/java/client/test/bin/IBM-Subscriber.sh
+++ b/java/client/test/bin/IBM-Subscriber.sh
@@ -16,4 +16,4 @@
 #
 
 export MSGSIZE=100
-qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq/ConnectionFactory -d amq/Topic  -db 1 -dx 4 -tc jms.r11.Subscriber -nt 4 $*
\ No newline at end of file
+qpid-run JMSPerfHarness -pc JNDI -ii com.sun.jndi.fscontext.RefFSContextFactory -iu file:/C:/temp/IBMPerfTestsJNDI/ -cf amq.ConnectionFactory -d amq.Topic  -db 1 -dx 4 -tc jms.r11.Subscriber -nt 4 $*
\ No newline at end of file
diff --git a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java b/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
index 5309b95eda..2c13ac6496 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
+++ b/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
@@ -32,7 +32,7 @@ import java.net.MalformedURLException;
 public class JNDIBindConnectionFactory
 {
 
-    public static final String CONNECTION_FACTORY_BINDING = "amq/ConnectionFactory";
+    public static final String CONNECTION_FACTORY_BINDING = "amq.ConnectionFactory";
     public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/IBMPerfTestsJNDI";
     public static final String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
     public static final String FSCONTEXT_FACTORY = "com.sun.jndi.fscontext.RefFSContextFactory";
@@ -47,11 +47,11 @@ public class JNDIBindConnectionFactory
 
         if (args.length > 0)
         {
-            provider = args[0];
+            connectionFactoryBinding = args[0];
 
             if (args.length > 1)
             {
-                connectionFactoryBinding = args[1];
+                provider = args[1];
 
                 if (args.length > 2)
                 {
@@ -66,7 +66,7 @@ public class JNDIBindConnectionFactory
         }
         else
         {
-            System.out.println("Using default values: Usage:java JNDIBindConnectionFactory [<Provider URL> [<Connection Factory Binding>] [<JNDI Context Factory>]]");
+            System.out.println("Using default values: Usage:java JNDIBindConnectionFactory [<Connection Factory Binding>] [<Provider URL>] [<JNDI Context Factory>]");
         }
         System.out.println("File System Context Factory\n" +
                            "Connection Factory Binding:" + connectionFactoryBinding + "\n" +
diff --git a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java b/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
index ec4c1814d4..b90fc8b3cd 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
+++ b/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
@@ -34,9 +34,7 @@ import java.io.File;
 import java.net.MalformedURLException;
 
 public class JNDIBindQueue
-{
-
-    public static final String CONNECTION_FACTORY_BINDING = "amq/ConnectionFactory";
+{    
     public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/IBMPerfTestsJNDI";
     public static final String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
     public static final String FSCONTEXT_FACTORY = "com.sun.jndi.fscontext.RefFSContextFactory";
diff --git a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java b/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
index b400f3d936..2de58a2b17 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
+++ b/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
@@ -33,9 +33,7 @@ import java.io.File;
 import java.net.MalformedURLException;
 
 public class JNDIBindTopic
-{
-
-    public static final String CONNECTION_FACTORY_BINDING = "amq/ConnectionFactory";
+{    
     public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/IBMPerfTestsJNDI";
     public static final String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;