activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mschoech...@apache.org
Subject [2/2] activemq git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq
Date Tue, 30 Jun 2015 06:18:26 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6248d051
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6248d051
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6248d051

Branch: refs/heads/master
Commit: 6248d0515cc9f4f5a580aa0284a047c543164351
Parents: b06c167 27edaff
Author: Marc Schoechlin <marc.schoechlin@breuninger.de>
Authored: Tue Jun 30 08:17:58 2015 +0200
Committer: Marc Schoechlin <marc.schoechlin@breuninger.de>
Committed: Tue Jun 30 08:17:58 2015 +0200

----------------------------------------------------------------------
 .../transport/ws/AbstractMQTTSocket.java        |  97 +++++--
 .../transport/ws/jetty8/MQTTSocket.java         |  57 ++---
 .../activemq/transport/ws/jetty8/WSServlet.java |   1 +
 .../transport/ws/jetty9/MQTTSocket.java         |  29 +--
 .../transport/util/HttpTransportUtilsTest.java  |  16 ++
 .../activemq/transport/ws/MQTTWSConnection.java | 253 +++++++++++++++++++
 .../ws/MQTTWSConnectionTimeoutTest.java         |  80 ++++++
 .../transport/ws/MQTTWSLinkStealingTest.java    | 130 ++++++++++
 .../transport/ws/MQTTWSTransportTest.java       | 216 ++++++++++++++++
 .../activemq/transport/ws/SocketTest.java       |  17 +-
 .../transport/ws/WSTransportTestSupport.java    |   9 +-
 .../transport/mqtt/MQTTInactivityMonitor.java   |   2 +-
 .../transport/mqtt/MQTTTransportFilter.java     |   5 +-
 .../activemq/transport/mqtt/MQTTWireFormat.java |  19 ++
 14 files changed, 858 insertions(+), 73 deletions(-)
----------------------------------------------------------------------



Mime
View raw message