Commit Graph

114 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) 29b4db5c34 https://issues.apache.org/jira/browse/AMQ-6521
Fixing support for Jetty 9.3 and Jetty 9.2.  The previous attempt at a
fix had the wrong class instance.
2016-12-09 09:47:16 -05:00
Christopher L. Shannon (cshannon) 80f46a8056 https://issues.apache.org/jira/browse/AMQ-6521
Adding support for Jetty 9.3 by re-adding in the logic to dynamically
load the correct GzipHandler depending on the version
2016-11-29 11:38:36 -05:00
Christopher L. Shannon (cshannon) f40532a23d https://issues.apache.org/jira/browse/AMQ-6491
Changing the WebSocket servlet to return a succesful empty response
instead of an error when a GET request is made
2016-11-22 07:27:29 -05:00
Christopher L. Shannon (cshannon) 937b2acd46 https://issues.apache.org/jira/browse/AMQ-6482
Adding websocket send timeout to AMQP over websockets
2016-11-04 14:09:26 -04:00
Christopher L. Shannon (cshannon) 450cabe4ea https://issues.apache.org/jira/browse/AMQ-6482
Adding a timeout for websocket sends to prevent the transport thread
from getting stuck and blocking.  The default is 30 seconds.
2016-11-04 12:56:20 -04:00
Christopher L. Shannon (cshannon) 946c9454d5 proposed websocket fix 2016-11-04 12:56:20 -04:00
Hadrian Zbarcea be24a133ef This closes #88 (merged as a65ac586). More file permissions fixes. 2016-11-03 14:26:34 -04:00
Hadrian Zbarcea d5a929c0d2 This closes #205. Won't fix. (fix even more file permissions) 2016-11-03 14:11:40 -04:00
Hadrian Zbarcea d54d046b8a This closes #185. Won't fix. (fix more file permissions) 2016-11-03 11:54:33 -04:00
Christopher L. Shannon (cshannon) 06e929f101 https://issues.apache.org/jira/browse/AMQ-6397
Setting the HTTP timeout for all HttpClients instead of just on send
2016-08-17 09:35:18 -04:00
Christopher L. Shannon (cshannon) 06a21dbbb3 [maven-release-plugin] prepare for next development iteration 2016-08-02 09:03:37 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
Christopher L. Shannon (cshannon) bd442a3388 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
2016-07-05 18:13:45 +00:00
Christopher L. Shannon (cshannon) 96494f74c7 https://issues.apache.org/jira/browse/AMQ-6346
Prevent concurrent access to the MQTT protocol handlers which can lead
to a tansport level deadlock
2016-07-05 17:50:03 +00:00
Timothy Bish 31c55f7510 https://issues.apache.org/jira/browse/AMQ-6339
Add support for AMQP client to connect using WebSockets.
2016-06-30 14:52:40 -04:00
Timothy Bish 5ba8679083 Allow for the connection to close without getting the ERROR frame 2016-06-16 11:20:59 -04:00
Timothy Bish 71893f1434 Allow the HTTP test to have extra time to wait for all messages to
arrive as the transmission rate is much slower.
2016-05-10 10:59:12 -04:00
Timothy Bish e47edd7a28 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.
2016-04-25 17:05:09 -04:00
Dejan Bosanac 34eb1ee959 https://issues.apache.org/jira/browse/AMQ-6259 - mqtt-over-ws configuration 2016-04-19 16:02:45 +02:00
Timothy Bish 30d6ad72fa NO-JIRA Allow for the disconnect call in the test to fail as the short
keepAlive interval can trigger a shutdown of the socket before we have a
chance to write the disconnect depending on the timing.
2016-03-17 14:08:09 -04:00
Christopher L. Shannon (cshannon) e375af3810 https://issues.apache.org/jira/browse/AMQ-6182
Adding missing License header
2016-03-01 16:01:58 +00:00
Christopher L. Shannon (cshannon) 473b3284d4 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.
2016-02-29 22:36:59 +00:00
Christopher L. Shannon (cshannon) 7335f699f2 https://issues.apache.org/jira/browse/AMQ-6182
adding timeout to test method
2016-02-26 19:20:16 +00:00
Christopher L. Shannon (cshannon) 4fb8083977 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.
2016-02-26 18:54:25 +00:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05:00
Christopher L. Shannon (cshannon) b9dcb010f7 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization
2015-12-15 19:37:05 +00:00
Christopher L. Shannon (cshannon) 913f64476b 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.
2015-12-07 15:29:13 +00:00
Christopher L. Shannon (cshannon) cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon) abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
gtully 0a12bcb928 https://issues.apache.org/jira/browse/AMQ-2191 https://issues.apache.org/jira/browse/AMQ-3529 - rework fixes to remove uncertanty from dealing with intettuptedexception. Sync requests will trap interrupts that ocurr while waiting for responses and fail the connection with an interruptedioexception. Interrupts pending before requests will be suppressed, allowing possible clean shutdown. It is not safe to replay openwire ops b/c they are not idempotent, the only safe option is to have a teardown of the broker side state from a close 2015-11-27 12:21:56 +00:00
Christopher L. Shannon (cshannon) bbde8473bd https://issues.apache.org/jira/browse/AMQ-5980
Fixing an intermittent test failure in:

org.apache.activemq.transport.ws.StompWSSTransportTest.
testHeartbeatsKeepsConnectionOpen

Adding synchronization on sends for StompWSConnection.  The protocol
doesn't allow multiple threads to call a blocking send at the same time
and the heartbeat keep alive thread was colliding with the main
thread on sends.
2015-11-22 19:01:31 +00:00
gtully d7a3b9406b https://issues.apache.org/jira/browse/AMQ-6029 - make certs available to tunnle servlet - HttpsNeedClientAuthSendAndReceiveTest regression, add javax.security so login exceptions can propogate over http - https://issues.apache.org/jira/browse/AMQ-6013 2015-11-18 16:08:29 +00:00
Timothy Bish caa6b8e253 https://issues.apache.org/jira/browse/AMQ-6046
Prevent concurrent access to protocol handlers which can lead to
transport level deadlocks.
2015-11-17 11:03:31 -05:00
gtully 8136e67b40 https://issues.apache.org/jira/browse/AMQ-6016 - ensure xstream inits transients to default values when it bypasses the default creation method through object deserialization. Can make it more general if there are ever more instances of this. It avoids the need to check for null and sync 2015-10-30 12:01:08 +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
Dejan Bosanac a7e2a44fe8 https://issues.apache.org/jira/browse/AMQ-6013 - restrict classes which can be serialized inside the broker 2015-10-16 15:44:23 +02:00
Christopher L. Shannon (cshannon) 0f492f3b4b https://issues.apache.org/jira/browse/AMQ-5356
Migrated to Karaf 4.  This was required to support Jetty 9.2.x.
Fixed all OSGi unit tests.
2015-09-03 12:42:22 +00: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
Christopher L. Shannon (cshannon) 04ee70a161 https://issues.apache.org/jira/browse/AMQ-5889
Adding support for auto detection of wire protocols over a transport.
OpenWire, AMQP, STOMP, and MQTT can all be detected and the broker
will properly handle each one over a given Transport.  Currently
auto TCP, NIO, SSL, and NIO+SSL transports can handle auto-detection
of the wire format and client but support could be added in the
future for other transports like websockets.
2015-08-11 19:39:29 +00:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04:00
Timothy Bish 50604ad932 Update RAT plugin to use latest version, add exclusions for eclipse
settins files and the KahaDB data folders created during most test runs.
Add missing headers to a couple files.
2015-08-05 13:08:15 -04:00
gtully a05a9a2129 https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build 2015-07-09 14:10:38 +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 d919db5e3d https://issues.apache.org/jira/browse/AMQ-5804
Apply patch from Pavlo Vasylchenko
2015-06-19 16:28:59 -04: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