Commit Graph

138 Commits

Author SHA1 Message Date
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
Timothy Bish 8ca6341d40 https://issues.apache.org/jira/browse/AMQ-5784
Apply patch from Lukas Treyer to address MQTT over WS in Jetty 9
2015-05-28 19:00: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 eea3230c37 https://issues.apache.org/jira/browse/AMQ-5155
Ensure that the inactivity monitor can see that new data is arriving to
prevent wrongful disconnect of clients.
2015-04-28 18:10:24 -04:00
Timothy Bish 9ef4259297 https://issues.apache.org/jira/browse/AMQ-5616
Use ConcurrentMap in declarations
2015-04-28 11:15:08 -04:00
Timothy Bish 299410820e https://issues.apache.org/jira/browse/AMQ-5155
Attempt to fix additional EOF problem
2015-04-02 09:10:08 -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 cad1a2a8cd Open up the xbean osgi import range to include 4.x 2015-03-04 12:43:44 -05:00
gtully ae595c95b1 [maven-release-plugin] prepare for next development iteration 2015-01-30 12:46:19 +00:00
gtully 4ba1a1689f [maven-release-plugin] prepare release activemq-5.11.0 2015-01-30 12:46:08 +00:00
gtully bf5a2997c7 [maven-release-plugin] prepare for next development iteration 2015-01-26 16:48:46 +00:00
gtully eec2955bde [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:48:37 +00:00
gtully 64fa706d54 Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit f47fbe4b89.
2015-01-26 16:39:35 +00:00
gtully f47fbe4b89 [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:17:43 +00: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 2128d4d246 Fix some itests due to the servlet import range being inadequate for the version of karaf we are testing with 2015-01-13 13:29:52 -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
gtully cf62d58ae7 https://issues.apache.org/jira/browse/AMQ-5515 - tidy up jetty deps - fix jetty maven coords 2015-01-12 22:58:07 +00:00
Hadrian Zbarcea 4bf5d0fc13 Test cleanup: use available port instead of hardcoded 2015-01-06 01:23:13 -05:00
Hadrian Zbarcea aedcae139b Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit 48b0cf396c.
2015-01-05 12:25:58 -05:00
Hadrian Zbarcea 89995f4723 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 7b285c6f52.
2015-01-05 12:25:47 -05:00
Dejan Bosanac 7b285c6f52 [maven-release-plugin] prepare for next development iteration 2014-12-29 12:44:32 +01:00
Dejan Bosanac 48b0cf396c [maven-release-plugin] prepare release activemq-5.11.0 2014-12-29 12:44:20 +01: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
Timothy Bish 14678e1c44 https://issues.apache.org/jira/browse/AMQ-5295
HTTPS Network Connector doesn't work with Mutual authentication-
HTTPSClientTransport uses wrong SSLSocketFactory
2014-08-13 12:44:25 -04:00
Dejan Bosanac fa086396a7 [maven-release-plugin] prepare for next development iteration 2014-06-05 11:59:29 +02:00
Dejan Bosanac 58dd93e42e [maven-release-plugin] prepare release activemq-5.10.0 2014-06-05 11:59:17 +02:00
Dejan Bosanac c2cf78542f [maven-release-plugin] prepare for next development iteration 2014-06-04 11:33:17 +02:00
Dejan Bosanac 5bc741f227 [maven-release-plugin] prepare release activemq-5.10.0 2014-06-04 11:33:03 +02:00
Hadrian Zbarcea ed11b067c5 Add missing license headers in preparation of releases 2014-03-31 18:43:54 -04:00
Hiram Chirino f364b8a391 Fixes regression caused by the implementation of AMQ-5050 2014-02-19 18:24:47 -05:00
Hadrian Zbarcea 7b555c2898 AMQ-5047. Fix packaging issues related to maven version 2014-02-15 16:15:04 -05:00
Kevin Earls c027552035 Upgraded surefire plugin to 2.16. AMQ-5006 2014-01-30 14:22:44 +01:00
Hiram Chirino bc4f4e92a6 Fixes AMQ-4896 - MQTT does not properly restore durable subs with the Paho client. 2013-11-18 12:11:34 -05:00
Timothy Bish 5e5458ec38 https://issues.apache.org/jira/browse/AMQ-3388
ignore unknown fields in openwire commands to allow interop between
openwire versions.
2013-11-13 10:36:53 -05:00
Kevin Earls 692428eee5 Fix for AMQ-4857, added test for null before accessing protocol string 2013-11-08 18:03:56 +01:00
Timothy Bish 0f09f78f3e fix for: https://issues.apache.org/jira/browse/AMQ-4740 2013-10-23 12:24:48 -04:00
Timothy Bish c015a98e0a Adds a little test case for Http based discovery 2013-10-18 17:27:13 -04:00
gtully 864aa6798f [maven-release-plugin] prepare for next development iteration 2013-10-14 23:38:35 +01:00
gtully 87c9bbebac [maven-release-plugin] prepare release activemq-5.9.0 2013-10-14 23:38:22 +01:00
Claus Ibsen bc2bc86a1d AMQ-4799: ws/wss connectors should also log uri when starting like the others do. 2013-10-11 16:34:29 +02:00
gtully ee0933c71e [maven-release-plugin] prepare for next development iteration 2013-10-11 14:51:36 +01:00
gtully b276006911 [maven-release-plugin] prepare release activemq-5.9.0 2013-10-11 14:51:24 +01:00
Hiram Chirino 272b846b0c Fixes AMQ-4723: HTTP Discovery agent should only poll for broker URLs while attempting to connect a transport. 2013-09-12 11:16:34 -04:00
Timothy A. Bish 34ce33613c workaround for issue: https://issues.apache.org/jira/browse/AMQ-4307
attempt to get around the deadlock by detecting and interrupting the locked thread.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1501500 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 19:53:26 +00:00
Timothy A. Bish 840ca30e90 workaround for issue: https://issues.apache.org/jira/browse/AMQ-4307
attempt to get around the deadlock by detecting and interrupting the locked thread.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1501488 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 19:40:08 +00:00
Bosanac Dejan 33ec1cf99b https://issues.apache.org/jira/browse/AMQ-4617 - mqtt over ws protocol
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1499777 13f79535-47bb-0310-9956-ffa450edef68
2013-07-04 14:54:29 +00:00
Timothy A. Bish 2aed3a708c patch for: https://issues.apache.org/jira/browse/AMQ-4427
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1463573 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 14:49:03 +00: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 56174e770d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443026 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:45:26 +00:00
Gary Tully 5e257808f3 [maven-release-plugin] prepare release activemq-5.8.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443024 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:43:41 +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
Timothy A. Bish ef24cc9a04 fix https://issues.apache.org/jira/browse/AMQ-4280
activemq-core module renamed to activemq-unit-tests

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439685 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 23:09:54 +00:00
Timothy A. Bish a55aae00e7 Scrub the pom files and remove old cruft and leftovers from the recent refactoring
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439680 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 22:44:25 +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