You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2006/09/25 15:03:40 UTC
svn commit: r449675 - in /incubator/qpid/trunk/qpid/java/client:
src/org/apache/qpid/client/transport/ test/bin/
test/src/org/apache/qpid/IBMPerfTest/ test/src/org/apache/qpid/forwardall/
Author: ritchiem
Date: Mon Sep 25 06:03:39 2006
New Revision: 449675
URL: http://svn.apache.org/viewvc?view=rev&rev=449675
Log:
Combined.java - removed ApplicationRegistry Reference
VmPipeTransportConnection.java - moved in to client package.
TransportConnection.java - updated imports
JNDIBindConnectionFactory.java - forced inclusion of url.
Updated JNDI Setup
Modified:
incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java
incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.bat
incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.sh
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java
Modified: incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java?view=diff&rev=449675&r1=449674&r2=449675
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java Mon Sep 25 06:03:39 2006
@@ -27,8 +27,8 @@
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;
Modified: incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java?view=diff&rev=449675&r1=449674&r2=449675
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/VmPipeTransportConnection.java Mon Sep 25 06:03:39 2006
@@ -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;
Modified: incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.bat
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.bat?view=diff&rev=449675&r1=449674&r2=449675
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.bat (original)
+++ incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.bat Mon Sep 25 06:03:39 2006
@@ -52,7 +52,7 @@
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/
Modified: incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.sh?view=diff&rev=449675&r1=449674&r2=449675
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.sh (original)
+++ incubator/qpid/trunk/qpid/java/client/test/bin/IBM-JNDI-Setup.sh Mon Sep 25 06:03:39 2006
@@ -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/
Modified: incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java?view=diff&rev=449675&r1=449674&r2=449675
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java Mon Sep 25 06:03:39 2006
@@ -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 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 @@
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 @@
}
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 @@
}
}
- 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 @@
try
{
- factory = new AMQConnectionFactory("amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5672'");
+ factory = new AMQConnectionFactory(CONNECTION_URL);
try
Modified: incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java?view=diff&rev=449675&r1=449674&r2=449675
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java (original)
+++ incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/forwardall/Combined.java Mon Sep 25 06:03:39 2006
@@ -23,7 +23,6 @@
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;
/**