activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mschoech...@apache.org
Subject [12/12] activemq git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq
Date Mon, 29 Jun 2015 21:26:29 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/06202097
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/06202097
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/06202097

Branch: refs/heads/master
Commit: 06202097a28b21efb9864d4d75a40cab7675bf98
Parents: 3870aa9 f3fc589
Author: Marc Schoechlin <marc.schoechlin@breuninger.de>
Authored: Mon Jun 29 22:01:14 2015 +0200
Committer: Marc Schoechlin <marc.schoechlin@breuninger.de>
Committed: Mon Jun 29 22:01:14 2015 +0200

----------------------------------------------------------------------
 activemq-http/pom.xml                           |  5 ++
 .../transport/util/HttpTransportUtils.java      | 20 +++++
 .../transport/ws/AbstractMQTTSocket.java        | 76 +++++++++++++++++++
 .../transport/ws/AbstractStompSocket.java       |  9 ++-
 .../transport/ws/jetty8/MQTTSocket.java         | 72 ++----------------
 .../transport/ws/jetty8/StompSocket.java        |  6 +-
 .../activemq/transport/ws/jetty8/WSServlet.java |  5 +-
 .../transport/ws/jetty9/MQTTSocket.java         | 78 +++-----------------
 .../transport/ws/jetty9/StompSocket.java        |  6 +-
 .../activemq/transport/ws/jetty9/WSServlet.java |  5 +-
 .../transport/util/HttpTransportUtilsTest.java  | 37 ++++++++++
 .../activemq/transport/ws/SocketTest.java       | 37 ++++++++++
 .../activemq/network/NetworkRouteTest.java      |  1 +
 13 files changed, 218 insertions(+), 139 deletions(-)
----------------------------------------------------------------------



Mime
View raw message