Commit Graph

36 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) fda982dccb https://issues.apache.org/jira/browse/AMQ-6343
On MQTT Websocket close, a LWT message will be properly sent if
configured and a disconnect packet was not received

(cherry picked from commit bd442a3388)
2016-07-05 18:19:24 +00:00
Timothy Bish 0c3d05f2ea https://issues.apache.org/jira/browse/AMQ-6262
Ensure that the connection check task is stopped once commands pass
through the inactivity monitor to prevent the transport from being
closed for no reason.
(cherry picked from commit e47edd7a28)
2016-04-25 17:05:45 -04:00
Christopher L. Shannon (cshannon) 317470330e https://issues.apache.org/jira/browse/AMQ-6182
Adding missing License header

(cherry picked from commit e375af3810)
2016-03-01 16:02:38 +00:00
Christopher L. Shannon (cshannon) d3bb4a1a67 https://issues.apache.org/jira/browse/AMQ-6182
Reworking patch so that the http trace method is also turned off by
default for the HttpTransport, besides just for the Websocket transport.
Also added SSL tests for both transports.

(cherry picked from commit 473b3284d4)
2016-02-29 22:38:19 +00:00
Christopher L. Shannon (cshannon) 6ca0e01a7e https://issues.apache.org/jira/browse/AMQ-6182
adding timeout to test method

(cherry picked from commit 7335f699f2)
2016-02-29 22:38:15 +00:00
Christopher L. Shannon (cshannon) cb4f4fbb47 https://issues.apache.org/jira/browse/AMQ-6182
Disabling the HTTP trace method on the websocket port by default.  It
can be enabled by setting the parameter "http.enableTrace=true" on the
connection uri if it is needed for debugging.

(cherry picked from commit 4fb8083977)
2016-02-26 18:55:12 +00:00
Christopher L. Shannon (cshannon) a4845253d0 https://issues.apache.org/jira/browse/AMQ-6073
WSServlet for websockets will attempt to detect the subprotocol
requested and respond with the appropriate one.  Currently the protocols
loaded are what stomp.js use for stomp (v11.stomp and v12.stomp).
If a protocol can't be found then a default will be returned, either
"stomp" or "mqtt", which is the same behavior before this patch.

This will make it a bit easier to use stomp over websockets out of the
box as stomp.js will work by default.

(cherry picked from commit 913f64476b)
2015-12-07 15:33:36 +00:00
Dejan Bosanac f8bfff0bc8 https://issues.apache.org/jira/browse/AMQ-6029 - wss transport with certificate authentication 2015-10-30 11:42:36 +01:00
Christopher L. Shannon (cshannon) f44c3d20ed https://issues.apache.org/jira/browse/AMQ-5356
Upgraded to Jetty 9.2.x to solve JDK 8 compatibility issues.
This required migrating to the new WebSocket API.
2015-09-03 11:54:57 +00:00
gtully 547476d1bc compact byteSequence before xstream marshall so that only required bytes are base64 encoded 2015-08-27 11:10:08 +01:00
Timothy Bish 10ae0d9d6f https://issues.apache.org/jira/browse/AMQ-5870
Resolve race that leads to stalled connect attempt.  Should fix the
failing CI tests that are seeing this.
2015-06-30 17:16:47 -04:00
Timothy Bish 27edaffded https://issues.apache.org/jira/browse/AMQ-5856
Clean up the MQTT over WebSocket code to allow for handling link
stealing and inactivity monitor.  Ensures that the web socket instances
get cleaned up on errors and avoids leaks that might otherwise arise.
Adds new tests for MQTT over WebSocket.

Adds some missing license headers as well.
2015-06-29 18:35:08 -04:00
Christopher L. Shannon (cshannon) be10b866a7 https://issues.apache.org/jira/browse/AMQ-5865
StompSocket and MQTTSocket will now return the appropriate web socket
remote address based on the HttpRequestServlet that initialized
the web socket connection.
2015-06-29 12:46:43 +00:00
Timothy Bish 73e8d10982 https://issues.apache.org/jira/browse/AMQ-5621
Test cleanup
2015-06-01 18:09:23 -04:00
Timothy Bish df06bdabdc https://issues.apache.org/jira/browse/AMQ-5816
Apply patch from Ievgen Tarasov that ensures that the data locator is
initialized when a MessageId is deserialized.
2015-06-01 17:50:20 -04:00
Timothy Bish 3125caee5b https://issues.apache.org/jira/browse/AMQ-5794
implement transport.connectAttemptTimeout option across the transports
fro OpenWire, STOMP, AMQP and MQTT and add tests to cover.
2015-05-26 12:29:23 -04:00
Timothy Bish f05f83b15d https://issues.apache.org/jira/browse/AMQ-5755
Unit tests for some STOMP over WebSockets functionality and some fixes
for resource cleanup.
2015-04-30 14:41:59 -04:00
Timothy Bish 516c9db43b https://issues.apache.org/jira/browse/AMQ-5155
Modifed version of patch supplied by Claudio Parodi to handle incoming
ping frames correctly.
2015-03-31 16:36:56 -04:00
Daniel Kulp ffa396ca2d Fix several eclipse warnings of unused things, and other compiler warnings 2015-01-13 15:03:10 -05:00
Daniel Kulp 3f82625077 [AMQ-5517] Runtime support for Jetty 9. Build/compile with Jetty8, but tests pass with Jetty 9 for runtime level support. 2015-01-13 12:47:53 -05:00
Daniel Kulp bc2e2d9a41 [AMQ-5517] Start stubbing in some of the extra params and such that will be needed to support jetty 9 2015-01-13 09:24:50 -05:00
Hadrian Zbarcea 4bf5d0fc13 Test cleanup: use available port instead of hardcoded 2015-01-06 01:23:13 -05:00
Timothy Bish 9b017fdb39 Ensure all resources shut down. 2014-08-18 17:58:58 -04:00
Timothy Bish 3aec42db4f https://issues.apache.org/jira/browse/AMQ-5237
Ensure that the allowLinkStealing option gets applied to the
WebTransportServer
2014-08-18 17:37:35 -04:00
Hadrian Zbarcea ed11b067c5 Add missing license headers in preparation of releases 2014-03-31 18:43:54 -04:00
Timothy Bish c015a98e0a Adds a little test case for Http based discovery 2013-10-18 17:27:13 -04:00
Christian Posta 571d452053 https://issues.apache.org/jira/browse/AMQ-4298 Add mutual authentication (needClientAuth) to https transport added tests as well
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445299 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 18:27:53 +00:00
Timothy A. Bish 877f83bc44 apply patch for: https://issues.apache.org/jira/browse/AMQ-4308
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1444204 13f79535-47bb-0310-9956-ffa450edef68
2013-02-08 19:44:27 +00:00
Timothy A. Bish d9db37ee95 apply patch for: https://issues.apache.org/jira/browse/AMQ-4307
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1444194 13f79535-47bb-0310-9956-ffa450edef68
2013-02-08 19:05:27 +00:00
Timothy A. Bish 46e67a10cc Enhances the Http(s) and ws(s) transport Servers such that they can update the connectUri after starting so that test cases can use the any port option on their URI like "localhost:0" and get the connection string after the BrokerService is started. This will allow most of those test cases to be updated so that they don't fail because the hard coded port is already bound.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443146 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:18:55 +00:00
Gary Tully fc519e186a fix up missing license files - our rat check friend
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442984 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 14:27:03 +00:00
Gary Tully 2ebba60265 fix deprecation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441410 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 12:00:33 +00:00
Christian Posta ff0746c190 https://issues.apache.org/jira/browse/AMQ-4200 Update the websocket example to use the latest stomp.js which supports STOMP 1.1 (including heart-beating).
Also added a websocket connector to the activemq-demo.xml config file.

Thanks Jeff Mensil!!

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1416524 13f79535-47bb-0310-9956-ffa450edef68
2012-12-03 14:02:39 +00:00
Timothy A. Bish 8ba3dd8a06 Add a log4j.properties
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1409820 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 14:58:02 +00:00
Hiram R. Chirino 98b985228f Move the remaining interesting bits out of activemq-optional to where they belong.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407198 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 18:12:18 +00:00
Hiram R. Chirino 9a1ad8c8b3 Split out the activemq-http and activemq-log4j-appender modules from the activemq-optional module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407139 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 15:51:10 +00:00