Author: rgreig
Date: Thu Oct 12 12:54:33 2006
New Revision: 463397
URL: http://svn.apache.org/viewvc?view=rev&rev=463397
Log:
Fixed incorrect package on AMQVMBrokerCreationException (did not match physical
location).
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/vmbroker/AMQVMBrokerCreationException.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/WriterTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.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=463397&r1=463396&r2=463397
==============================================================================
---
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
Thu Oct 12 12:54:33 2006
@@ -27,7 +27,7 @@
import org.apache.qpid.client.AMQBrokerDetails;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.pool.ReadWriteThreadModel;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import java.io.IOException;
@@ -107,34 +107,20 @@
{
case TCP:
- if (Boolean.getBoolean("amqj.useBlockingIo"))
+ _instance = new SocketTransportConnection(new
SocketTransportConnection.SocketConnectorFactory()
{
- _instance = new SocketTransportConnection(new
SocketTransportConnection.SocketConnectorFactory()
+ public IoConnector newSocketConnector()
{
- public IoConnector newSocketConnector()
- {
- return new org.apache.qpid.bio.SocketConnector();
// blocking connector
- }
- });
- }
- else
- {
- _instance = new SocketTransportConnection(new
SocketTransportConnection.SocketConnectorFactory()
- {
- public IoConnector newSocketConnector()
- {
- SocketConnector result = new SocketConnector(); //
non-blocking connector
-
- // Don't have the connector's worker thread wait
around for other connections (we only use
- // one SocketConnector per connection at the
moment anyway). This allows short-running
- // clients (like unit tests) to complete quickly.
- result.setWorkerTimeout(0L);
-
- return result;
- }
- });
+ SocketConnector result = new SocketConnector(); //
non-blocking connector
- }
+ // Don't have the connector's worker thread wait
around for other connections (we only use
+ // one SocketConnector per connection at the moment
anyway). This allows short-running
+ // clients (like unit tests) to complete quickly.
+ result.setWorkerTimeout(0);
+
+ return result;
+ }
+ });
break;
case VM:
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
Thu Oct 12 12:54:33 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.qpid.vmbroker;
+package org.apache.qpid.client.vmbroker;
import org.apache.qpid.client.transport.AMQTransportConnectionException;
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
Thu Oct 12 12:54:33 2006
@@ -30,7 +30,9 @@
org.apache.qpid.basic.UnitTests.class,
org.apache.qpid.client.channelclose.UnitTests.class,
org.apache.qpid.client.message.UnitTests.class,
- org.apache.qpid.forwardall.UnitTests.class
+ org.apache.qpid.forwardall.UnitTests.class,
+ org.apache.qpid.destinationurl.UnitTests.class,
+ org.apache.qpid.jndi.referenceabletest.UnitTests.class
})
public class AllClientUnitTests
{
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
Thu Oct 12 12:54:33 2006
@@ -67,7 +67,7 @@
_session1.createConsumer(_destination1).setMessageListener(new
MessageListener() {
public void onMessage(Message message)
{
- _log.info("consumer 1 got message [" + getTextMessage(message)
+ "]");
+ _log.debug("consumer 1 got message [" +
getTextMessage(message) + "]");
synchronized (_received1)
{
_received1.add(message);
@@ -79,7 +79,7 @@
_session2.createConsumer(_destination2).setMessageListener(new
MessageListener() {
public void onMessage(Message message)
{
- _log.info("consumer 2 got message [" +
getTextMessage(message) + "]");
+ _log.debug("consumer 2 got message [" +
getTextMessage(message) + "]");
synchronized (_received2)
{
_received2.add(message);
@@ -170,7 +170,7 @@
private void send(Session session, Destination destination, String
message) throws JMSException
{
- _log.info("sending message " + message);
+ _log.debug("sending message " + message);
MessageProducer producer1 = session.createProducer(destination);
producer1.send(session.createTextMessage(message));
}
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
Thu Oct 12 12:54:33 2006
@@ -19,7 +19,7 @@
import org.apache.log4j.Logger;
import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
public class FailoverBrokerTester implements Runnable
{
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
Thu Oct 12 12:54:33 2006
@@ -71,16 +71,9 @@
@Test
public void startAcceptor() throws IOException
{
- boolean useMultithreadedIoProcessor =
Boolean.getBoolean("qpid.io.multithreaded");
IoAcceptor acceptor = null;
- if (useMultithreadedIoProcessor)
- {
- acceptor = new org.apache.qpid.nio.SocketAcceptor();
- }
- else
- {
- acceptor = new SocketAcceptor();
- }
+ acceptor = new SocketAcceptor();
+
SocketAcceptorConfig config = (SocketAcceptorConfig)
acceptor.getDefaultConfig();
SocketSessionConfig sc = (SocketSessionConfig)
config.getSessionConfig();
sc.setTcpNoDelay(true);
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/WriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/WriterTest.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/WriterTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/mina/WriterTest.java
Thu Oct 12 12:54:33 2006
@@ -175,15 +175,9 @@
public void startWriter() throws IOException, InterruptedException
{
IoConnector ioConnector = null;
- boolean useMultithreadedIoProcessor =
Boolean.getBoolean("qpid.io.multithreaded");
- if (useMultithreadedIoProcessor)
- {
- ioConnector = new org.apache.qpid.nio.SocketConnector();
- }
- else
- {
- ioConnector = new SocketConnector();
- }
+
+ ioConnector = new SocketConnector();
+
SocketConnectorConfig cfg = (SocketConnectorConfig)
ioConnector.getDefaultConfig();
cfg.setThreadModel(ThreadModel.MANUAL);
SocketSessionConfig scfg = (SocketSessionConfig)
cfg.getSessionConfig();
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
Thu Oct 12 12:54:33 2006
@@ -17,7 +17,7 @@
*/
package org.apache.qpid.requestreply1;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.client.transport.TransportConnection;
import org.junit.Test;
import org.junit.Before;
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
Thu Oct 12 12:54:33 2006
@@ -23,7 +23,7 @@
import org.junit.Before;
import org.junit.After;
import org.apache.qpid.AMQException;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.url.URLSyntaxException;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQSession;
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java?view=diff&rev=463397&r1=463396&r2=463397
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
Thu Oct 12 12:54:33 2006
@@ -22,7 +22,7 @@
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.junit.After;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
