From b958e0992bfe956553676e571c9dd932ae49172d Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 22 Sep 2006 16:27:13 +0000
Subject: 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
---
 .../org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java    | 8 ++++----
 .../test/src/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java       | 4 +---
 .../test/src/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java       | 4 +---
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'java/client/test/src')

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;
 
-- 
cgit v1.2.1