summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--java/client/src/org/apache/qpid/client/transport/TransportConnection.java2
-rw-r--r--java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java2
-rw-r--r--java/client/test/bin/IBM-JNDI-Setup.bat2
-rwxr-xr-xjava/client/test/bin/IBM-JNDI-Setup.sh2
-rw-r--r--java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java49
-rw-r--r--java/client/test/src/org/apache/qpid/forwardall/Combined.java1
6 files changed, 38 insertions, 20 deletions
diff --git a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
index 6894aa25a8..4adde3e002 100644
--- a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
+++ b/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
@@ -27,9 +27,9 @@ import org.apache.mina.transport.vmpipe.VmPipeAddress;
import org.apache.qpid.client.AMQBrokerDetails;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.pool.ReadWriteThreadModel;
-import org.apache.qpid.transport.VmPipeTransportConnection;
import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java b/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java
index decfbd57e0..d7cfd93bd6 100644
--- a/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java
+++ b/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.client.transport;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
diff --git a/java/client/test/bin/IBM-JNDI-Setup.bat b/java/client/test/bin/IBM-JNDI-Setup.bat
index c167398859..fdf2b1cef5 100644
--- a/java/client/test/bin/IBM-JNDI-Setup.bat
+++ b/java/client/test/bin/IBM-JNDI-Setup.bat
@@ -52,7 +52,7 @@ 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%" org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory
+"%JAVA_HOME%\bin\java" -server -Xmx1024m -DQPID_HOME="%QPID_HOME%" -cp "%CLIENT_TEST_CLASSES%" org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory amqp://guest:guest@clientid/testpath?brokerlist='vm://:1' amq.VMConnectionFactory
"%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/
diff --git a/java/client/test/bin/IBM-JNDI-Setup.sh b/java/client/test/bin/IBM-JNDI-Setup.sh
index b0f5cd0315..162437c940 100755
--- a/java/client/test/bin/IBM-JNDI-Setup.sh
+++ b/java/client/test/bin/IBM-JNDI-Setup.sh
@@ -15,7 +15,7 @@
# limitations under the License.
#
-qpid-run org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory amq.ConnectionFactorty
+qpid-run org.apache.qpid.IBMPerfTest.JNDIBindConnectionFactory amqp://guest:guest@clientid/testpath?brokerlist='vm://:1' amq.VMConnectionFactory
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/
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 2c13ac6496..ff276fb07c 100644
--- a/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
+++ b/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
@@ -17,17 +17,16 @@
*/
package org.apache.qpid.IBMPerfTest;
-import org.apache.qpid.client.AMQConnectionFactory;
-import org.apache.log4j.Logger;
import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.qpid.client.AMQConnectionFactory;
+import javax.jms.ConnectionFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.jms.ConnectionFactory;
-import java.util.Hashtable;
import java.io.File;
-import java.net.MalformedURLException;
+import java.util.Hashtable;
public class JNDIBindConnectionFactory
{
@@ -36,6 +35,13 @@ public class JNDIBindConnectionFactory
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";
+ public static final String DEFAULT_CONNECTION_URL = "amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5672'";
+
+ private static void printUsage()
+ {
+ System.out.println("Using default values: Usage:java JNDIBindConnectionFactory <connection url> [<Connection Factory Binding>] [<Provider URL>] [<JNDI Context Factory>]");
+
+ }
public static void main(String[] args)
{
@@ -44,18 +50,28 @@ public class JNDIBindConnectionFactory
String connectionFactoryBinding = CONNECTION_FACTORY_BINDING;
String provider = PROVIDER_URL;
String contextFactory = FSCONTEXT_FACTORY;
+ if (args.length == 0)
+ {
+ printUsage();
+ System.exit(1);
+ }
+
+ String connectionURL = args[0];
- if (args.length > 0)
+ System.out.println("Using Connection:" + connectionURL + "\n");
+
+
+ if (args.length > 1)
{
- connectionFactoryBinding = args[0];
+ connectionFactoryBinding = args[1];
- if (args.length > 1)
+ if (args.length > 2)
{
- provider = args[1];
+ provider = args[2];
- if (args.length > 2)
+ if (args.length > 3)
{
- contextFactory = args[2];
+ contextFactory = args[3];
}
}
else
@@ -66,9 +82,12 @@ public class JNDIBindConnectionFactory
}
else
{
- System.out.println("Using default values: Usage:java JNDIBindConnectionFactory [<Connection Factory Binding>] [<Provider URL>] [<JNDI Context Factory>]");
+ printUsage();
}
+
+
System.out.println("File System Context Factory\n" +
+ "Connection:" + connectionURL + "\n" +
"Connection Factory Binding:" + connectionFactoryBinding + "\n" +
"JNDI Provider URL:" + provider);
@@ -94,11 +113,11 @@ public class JNDIBindConnectionFactory
}
}
- new JNDIBindConnectionFactory(provider, connectionFactoryBinding, contextFactory);
+ new JNDIBindConnectionFactory(provider, connectionFactoryBinding, contextFactory, connectionURL);
}
- public JNDIBindConnectionFactory(String provider, String binding, String contextFactory)
+ public JNDIBindConnectionFactory(String provider, String binding, String contextFactory, String CONNECTION_URL)
{
// Set up the environment for creating the initial context
Hashtable env = new Hashtable(11);
@@ -116,7 +135,7 @@ public class JNDIBindConnectionFactory
try
{
- factory = new AMQConnectionFactory("amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5672'");
+ factory = new AMQConnectionFactory(CONNECTION_URL);
try
diff --git a/java/client/test/src/org/apache/qpid/forwardall/Combined.java b/java/client/test/src/org/apache/qpid/forwardall/Combined.java
index 2e32798171..f8879dcb0c 100644
--- a/java/client/test/src/org/apache/qpid/forwardall/Combined.java
+++ b/java/client/test/src/org/apache/qpid/forwardall/Combined.java
@@ -23,7 +23,6 @@ import org.junit.Before;
import org.junit.Assert;
import org.junit.After;
import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
/**
View Lorry Controller Status