diff options
Diffstat (limited to 'qpid/java/broker-plugins')
13 files changed, 121 insertions, 30 deletions
diff --git a/qpid/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml index ac633ab369..0e718c80c9 100644 --- a/qpid/java/broker-plugins/access-control/build.xml +++ b/qpid/java/broker-plugins/access-control/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins Access Control" default="build"> <property name="module.depends" value="common broker-core" /> - <property name="module.test.depends" value="common/tests broker-core/tests management/common" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests management/common" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml b/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml index 5aed89f43e..3537be172d 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins AMQP 0-10 Protocol" default="build"> <property name="module.depends" value="common broker-core" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml index 5c8d5e3135..0ab2b0b833 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins AMQP 0-8 Protocol" default="build"> <property name="module.depends" value="common broker-core" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java index e8fda2bc65..5b1e5af7bd 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java @@ -20,38 +20,38 @@ */ package org.apache.qpid.server.protocol.v0_8; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.security.Principal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; + +import javax.security.auth.Subject; + import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.abstraction.MessagePublishInfo; import org.apache.qpid.protocol.AMQConstant; -import org.apache.qpid.server.protocol.AMQSessionModel; -import org.apache.qpid.server.protocol.v0_8.AMQChannel; -import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.message.MessageContentSource; import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.protocol.v0_8.AMQProtocolEngine; +import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.server.subscription.ClientDeliveryMethod; import org.apache.qpid.server.subscription.Subscription; -import org.apache.qpid.server.protocol.v0_8.SubscriptionImpl; import org.apache.qpid.server.virtualhost.VirtualHost; -import org.apache.qpid.transport.TestNetworkConnection; - -import javax.security.auth.Subject; - -import java.security.Principal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; +import org.apache.qpid.transport.Sender; +import org.apache.qpid.transport.network.NetworkConnection; public class InternalTestProtocolSession extends AMQProtocolEngine implements ProtocolOutputConverter { @@ -266,4 +266,95 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr } } } + + private static class TestNetworkConnection implements NetworkConnection + { + private String _remoteHost = "127.0.0.1"; + private String _localHost = "127.0.0.1"; + private int _port = 1; + private final Sender<ByteBuffer> _sender; + + public TestNetworkConnection() + { + _sender = new Sender<ByteBuffer>() + { + public void setIdleTimeout(int i) + { + } + + public void send(ByteBuffer msg) + { + } + + public void flush() + { + } + + public void close() + { + } + }; + } + + @Override + public SocketAddress getLocalAddress() + { + return new InetSocketAddress(_localHost, _port); + } + + @Override + public SocketAddress getRemoteAddress() + { + return new InetSocketAddress(_remoteHost, _port); + } + + @Override + public void setMaxReadIdle(int idleTime) + { + } + + @Override + public void setPeerPrincipal(Principal principal) + { + } + + @Override + public Principal getPeerPrincipal() + { + return null; + } + + @Override + public int getMaxReadIdle() + { + return 0; + } + + @Override + public int getMaxWriteIdle() + { + return 0; + } + + @Override + public void setMaxWriteIdle(int idleTime) + { + } + + @Override + public void close() + { + } + + @Override + public Sender<ByteBuffer> getSender() + { + return _sender; + } + + @Override + public void start() + { + } + } } diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml index 99620905db..00926c0787 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins AMQP 1.0 Protocol" default="build"> <property name="module.depends" value="common broker-core amqp-1-0-common" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml index 66a08ddc31..161a4c394c 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion" default="build"> <property name="module.depends" value="common broker-core amqp-1-0-common broker-plugins/amqp-1-0-protocol broker-plugins/amqp-0-10-protocol" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-amqp-1-0-common=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided -Sqpid-broker-plugins-amqp-1-0-protocol=provided"/> diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml index 0d83e18abe..26a89bfed9 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins AMQP 0.8 to 0.10 MessageConversion" default="build"> <property name="module.depends" value="common broker-core broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-broker-plugins-amqp-0-10-protocol=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided"/> diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml index 8a8a4eadfa..f28b6760e5 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins AMQP 0.8 to 1.0 MessageConversion" default="build"> <property name="module.depends" value="common broker-core amqp-1-0-common broker-plugins/amqp-0-8-protocol broker-plugins/amqp-1-0-protocol" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-amqp-1-0-common=provided -Sqpid-broker-plugins-amqp-1-0-protocol=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided"/> diff --git a/qpid/java/broker-plugins/derby-store/build.xml b/qpid/java/broker-plugins/derby-store/build.xml index c0d1bcb4b1..95d3263fbc 100644 --- a/qpid/java/broker-plugins/derby-store/build.xml +++ b/qpid/java/broker-plugins/derby-store/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins Derby Store" default="build"> <property name="module.depends" value="common broker-core" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> diff --git a/qpid/java/broker-plugins/jdbc-store/build.xml b/qpid/java/broker-plugins/jdbc-store/build.xml index f82c22119d..4a8e72898c 100644 --- a/qpid/java/broker-plugins/jdbc-store/build.xml +++ b/qpid/java/broker-plugins/jdbc-store/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins JDBC Store" default="build"> <property name="module.depends" value="common broker-core" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> diff --git a/qpid/java/broker-plugins/management-http/build.xml b/qpid/java/broker-plugins/management-http/build.xml index 188e64c885..05af45a289 100644 --- a/qpid/java/broker-plugins/management-http/build.xml +++ b/qpid/java/broker-plugins/management-http/build.xml @@ -19,7 +19,7 @@ <project name="Qpid Broker-Plugins Management HTTP" default="build"> <property name="module.depends" value="common broker-core" /> - <property name="module.test.depends" value="broker-core/tests common/tests management/common client" /> + <property name="module.test.depends" value="broker-core/tests qpid-test-utils management/common client" /> <property name="module.genpom" value="true" /> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided" /> diff --git a/qpid/java/broker-plugins/management-jmx/build.xml b/qpid/java/broker-plugins/management-jmx/build.xml index 98c821ed5c..0209ecbd7a 100644 --- a/qpid/java/broker-plugins/management-jmx/build.xml +++ b/qpid/java/broker-plugins/management-jmx/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins Management JMX" default="build"> <property name="module.depends" value="common broker-core management/common" /> - <property name="module.test.depends" value="broker-core/tests common/tests management/common client" /> + <property name="module.test.depends" value="broker-core/tests qpid-test-utils management/common client" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided -Sqpid-management-common=provided"/> diff --git a/qpid/java/broker-plugins/memory-store/build.xml b/qpid/java/broker-plugins/memory-store/build.xml index 14567ad3d5..6d107b7803 100644 --- a/qpid/java/broker-plugins/memory-store/build.xml +++ b/qpid/java/broker-plugins/memory-store/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins Memory Store" default="build"> <property name="module.depends" value="common broker-core" /> - <property name="module.test.depends" value="common/tests broker-core/tests" /> + <property name="module.test.depends" value="qpid-test-utils broker-core/tests" /> <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker-core=provided"/> |