Author: chirino
Date: Fri May 17 22:03:38 2013
New Revision: 1484012
URL: http://svn.apache.org/r1484012
Log:
Latest hawtdispatch snapshot should fix the hang in the MQTT SSL test.
Modified:
activemq/trunk/activemq-mqtt/pom.xml
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/AbstractMQTTTest.java
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-mqtt/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-mqtt/pom.xml?rev=1484012&r1=1484011&r2=1484012&view=diff
==============================================================================
--- activemq/trunk/activemq-mqtt/pom.xml (original)
+++ activemq/trunk/activemq-mqtt/pom.xml Fri May 17 22:03:38 2013
@@ -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>
Modified:
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/AbstractMQTTTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/AbstractMQTTTest.java?rev=1484012&r1=1484011&r2=1484012&view=diff
==============================================================================
---
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/AbstractMQTTTest.java
(original)
+++
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/AbstractMQTTTest.java
Fri May 17 22:03:38 2013
@@ -332,7 +332,7 @@ public abstract class AbstractMQTTTest e
}
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 {
Modified:
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java?rev=1484012&r1=1484011&r2=1484012&view=diff
==============================================================================
---
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java
(original)
+++
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java
Fri May 17 22:03:38 2013
@@ -47,6 +47,7 @@ public class MQTTSSLTest extends MQTTTes
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");
Modified:
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java?rev=1484012&r1=1484011&r2=1484012&view=diff
==============================================================================
---
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
(original)
+++
activemq/trunk/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
Fri May 17 22:03:38 2013
@@ -128,11 +128,10 @@ public class MQTTTest extends AbstractMQ
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 AbstractMQ
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
Modified: activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1484012&r1=1484011&r2=1484012&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri May 17 22:03:38 2013
@@ -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>
