Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D1CA17516 for ; Mon, 29 Jun 2015 19:38:52 +0000 (UTC) Received: (qmail 80701 invoked by uid 500); 29 Jun 2015 19:38:52 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 80657 invoked by uid 500); 29 Jun 2015 19:38:52 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 80553 invoked by uid 99); 29 Jun 2015 19:38:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 19:38:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 09E50E35D7; Mon, 29 Jun 2015 19:38:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Date: Mon, 29 Jun 2015 19:38:53 -0000 Message-Id: <92dbd7f229424f3f808db300afc12a4f@git.apache.org> In-Reply-To: <3f7f7780db6c46efbc62c71a26a5d448@git.apache.org> References: <3f7f7780db6c46efbc62c71a26a5d448@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq git commit: This closes #124 This closes #124 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f3fc5894 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f3fc5894 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f3fc5894 Branch: refs/heads/master Commit: f3fc58941290041f5ff7fb80183b063b7eeef9d8 Parents: bbf288b be10b86 Author: Timothy Bish Authored: Mon Jun 29 15:28:36 2015 -0400 Committer: Timothy Bish Committed: Mon Jun 29 15:28:36 2015 -0400 ---------------------------------------------------------------------- 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 ++++++++++ 12 files changed, 217 insertions(+), 139 deletions(-) ----------------------------------------------------------------------