mirror of https://github.com/apache/activemq.git
Latest hawtdispatch snapshot should fix the hang in the MQTT SSL test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1484012 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
be7cef6438
commit
f20e17ae32
|
@ -54,6 +54,11 @@
|
||||||
<groupId>org.fusesource.mqtt-client</groupId>
|
<groupId>org.fusesource.mqtt-client</groupId>
|
||||||
<artifactId>mqtt-client</artifactId>
|
<artifactId>mqtt-client</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.fusesource.hawtdispatch</groupId>
|
||||||
|
<artifactId>hawtdispatch-transport</artifactId>
|
||||||
|
<version>${hawtdispatch-version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- =============================== -->
|
<!-- =============================== -->
|
||||||
<!-- Optional Dependencies -->
|
<!-- Optional Dependencies -->
|
||||||
|
@ -201,20 +206,15 @@
|
||||||
<forkMode>always</forkMode>
|
<forkMode>always</forkMode>
|
||||||
<argLine>${surefire.argLine}</argLine>
|
<argLine>${surefire.argLine}</argLine>
|
||||||
<runOrder>alphabetical</runOrder>
|
<runOrder>alphabetical</runOrder>
|
||||||
|
<!-- Note: if you want to see log messages on the console window remove the following comment -->
|
||||||
<redirectTestOutputToFile>false</redirectTestOutputToFile>
|
<redirectTestOutputToFile>false</redirectTestOutputToFile>
|
||||||
<systemProperties>
|
<systemProperties>
|
||||||
<property>
|
<property>
|
||||||
<name>org.apache.activemq.default.directory.prefix</name>
|
<name>org.apache.activemq.default.directory.prefix</name>
|
||||||
<value>target/</value>
|
<value>target/</value>
|
||||||
</property>
|
</property>
|
||||||
<property>
|
|
||||||
<name>javax.net.debug</name>
|
|
||||||
<value>all/</value>
|
|
||||||
</property>
|
|
||||||
<!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
|
<!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
|
||||||
while running mvn:test
|
while running mvn:test
|
||||||
Note: if you want to see log messages on the console window remove
|
|
||||||
"redirectTestOutputToFile" from the parent pom
|
|
||||||
-->
|
-->
|
||||||
<!--
|
<!--
|
||||||
<property>
|
<property>
|
||||||
|
|
|
@ -332,7 +332,7 @@ public abstract class AbstractMQTTTest extends AutoFailTestSupport {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void addMQTTConnector(String config) throws Exception {
|
protected void addMQTTConnector(String config) throws Exception {
|
||||||
mqttConnector = brokerService.addConnector(getProtocolScheme()+"://localhost:0?trace=true&" + config);
|
mqttConnector = brokerService.addConnector(getProtocolScheme()+"://localhost:0?" + config);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void initializeConnection(MQTTClientProvider provider) throws Exception {
|
protected void initializeConnection(MQTTClientProvider provider) throws Exception {
|
||||||
|
|
|
@ -47,6 +47,7 @@ public class MQTTSSLTest extends MQTTTest {
|
||||||
protected MQTT createMQTTConnection() throws Exception {
|
protected MQTT createMQTTConnection() throws Exception {
|
||||||
MQTT mqtt = new MQTT();
|
MQTT mqtt = new MQTT();
|
||||||
mqtt.setConnectAttemptsMax(1);
|
mqtt.setConnectAttemptsMax(1);
|
||||||
|
mqtt.setReconnectAttemptsMax(0);
|
||||||
mqtt.setTracer(createTracer());
|
mqtt.setTracer(createTracer());
|
||||||
mqtt.setHost("ssl://localhost:"+mqttConnector.getConnectUri().getPort());
|
mqtt.setHost("ssl://localhost:"+mqttConnector.getConnectUri().getPort());
|
||||||
SSLContext ctx = SSLContext.getInstance("TLS");
|
SSLContext ctx = SSLContext.getInstance("TLS");
|
||||||
|
|
|
@ -128,11 +128,10 @@ public class MQTTTest extends AbstractMQTTTest {
|
||||||
protected MQTT createMQTTConnection() throws Exception {
|
protected MQTT createMQTTConnection() throws Exception {
|
||||||
MQTT mqtt = new MQTT();
|
MQTT mqtt = new MQTT();
|
||||||
mqtt.setConnectAttemptsMax(1);
|
mqtt.setConnectAttemptsMax(1);
|
||||||
|
mqtt.setReconnectAttemptsMax(0);
|
||||||
mqtt.setTracer(createTracer());
|
mqtt.setTracer(createTracer());
|
||||||
mqtt.setHost("localhost", mqttConnector.getConnectUri().getPort());
|
mqtt.setHost("localhost", mqttConnector.getConnectUri().getPort());
|
||||||
// shut off connect retry
|
// shut off connect retry
|
||||||
mqtt.setConnectAttemptsMax(0);
|
|
||||||
mqtt.setReconnectAttemptsMax(0);
|
|
||||||
return mqtt;
|
return mqtt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,12 +139,12 @@ public class MQTTTest extends AbstractMQTTTest {
|
||||||
return new Tracer(){
|
return new Tracer(){
|
||||||
@Override
|
@Override
|
||||||
public void onReceive(MQTTFrame frame) {
|
public void onReceive(MQTTFrame frame) {
|
||||||
LOG.info("Client Received:\n"+frame);
|
// LOG.info("Client Received:\n"+frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSend(MQTTFrame frame) {
|
public void onSend(MQTTFrame frame) {
|
||||||
LOG.info("Client Sent:\n" + frame);
|
// LOG.info("Client Sent:\n" + frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -65,7 +65,7 @@
|
||||||
<geronimo-version>1.0</geronimo-version>
|
<geronimo-version>1.0</geronimo-version>
|
||||||
<hadoop-version>1.0.0</hadoop-version>
|
<hadoop-version>1.0.0</hadoop-version>
|
||||||
<hawtbuf-version>1.9</hawtbuf-version>
|
<hawtbuf-version>1.9</hawtbuf-version>
|
||||||
<hawtdispatch-version>1.15</hawtdispatch-version>
|
<hawtdispatch-version>1.17-SNAPSHOT</hawtdispatch-version>
|
||||||
<howl-version>0.1.8</howl-version>
|
<howl-version>0.1.8</howl-version>
|
||||||
<hsqldb-version>1.8.0.12</hsqldb-version>
|
<hsqldb-version>1.8.0.12</hsqldb-version>
|
||||||
<httpclient-version>4.2.3</httpclient-version>
|
<httpclient-version>4.2.3</httpclient-version>
|
||||||
|
|
Loading…
Reference in New Issue