Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Hiram R. Chirino 2013-05-17 22:03:38 +00:00
parent be7cef6438
commit f20e17ae32
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-mqtt/pom.xml
View File

@ -54,6 +54,11 @@
<groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId>
</dependency>
<dependency>
<groupId>org.fusesource.hawtdispatch</groupId>
<artifactId>hawtdispatch-transport</artifactId>
<version>${hawtdispatch-version}</version>
</dependency>
<!-- =============================== -->
<!-- Optional Dependencies -->
@ -201,20 +206,15 @@
<forkMode>always</forkMode>
<argLine>${surefire.argLine}</argLine>
<runOrder>alphabetical</runOrder>
<!-- Note: if you want to see log messages on the console window remove the following comment -->
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<systemProperties>
<property>
<name>org.apache.activemq.default.directory.prefix</name>
<value>target/</value>
</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)
while running mvn:test
Note: if you want to see log messages on the console window remove
"redirectTestOutputToFile" from the parent pom
-->
<!--
<property>

2
activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/AbstractMQTTTest.java
View File

@ -332,7 +332,7 @@ public abstract class AbstractMQTTTest extends AutoFailTestSupport {
}
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 {

1
activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java
View File

@ -47,6 +47,7 @@ public class MQTTSSLTest extends MQTTTest {
protected MQTT createMQTTConnection() throws Exception {
MQTT mqtt = new MQTT();
mqtt.setConnectAttemptsMax(1);
mqtt.setReconnectAttemptsMax(0);
mqtt.setTracer(createTracer());
mqtt.setHost("ssl://localhost:"+mqttConnector.getConnectUri().getPort());
SSLContext ctx = SSLContext.getInstance("TLS");

7
activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
View File

@ -128,11 +128,10 @@ public class MQTTTest extends AbstractMQTTTest {
protected MQTT createMQTTConnection() throws Exception {
MQTT mqtt = new MQTT();
mqtt.setConnectAttemptsMax(1);
mqtt.setReconnectAttemptsMax(0);
mqtt.setTracer(createTracer());
mqtt.setHost("localhost", mqttConnector.getConnectUri().getPort());
// shut off connect retry
mqtt.setConnectAttemptsMax(0);
mqtt.setReconnectAttemptsMax(0);
return mqtt;
}
@ -140,12 +139,12 @@ public class MQTTTest extends AbstractMQTTTest {
return new Tracer(){
@Override
public void onReceive(MQTTFrame frame) {
LOG.info("Client Received:\n"+frame);
// LOG.info("Client Received:\n"+frame);
}
@Override
public void onSend(MQTTFrame frame) {
LOG.info("Client Sent:\n" + frame);
// LOG.info("Client Sent:\n" + frame);
}
@Override

2
pom.xml
View File

@ -65,7 +65,7 @@
<geronimo-version>1.0</geronimo-version>
<hadoop-version>1.0.0</hadoop-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>
<hsqldb-version>1.8.0.12</hsqldb-version>
<httpclient-version>4.2.3</httpclient-version>