Commit Graph

9103 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) 0dc76e02aa https://issues.apache.org/jira/browse/AMQ-6212
Adding spring-messaging to the artifactSet for activemq-all to be
included inside the shaded jar

(cherry picked from commit 4bd9a4ef6f)
2016-03-14 17:00:44 +00:00
Timothy Bish 3dc769d1f6 https://issues.apache.org/jira/browse/AMQ-6207
Perform writes / sync in predicatable order first to the recovery file
and then into the main index file.
(cherry picked from commit b39ab7867c)
2016-03-11 10:55:39 -05:00
Christopher L. Shannon (cshannon) 442fadac87 https://issues.apache.org/jira/browse/AMQ-6204
Fixing the removal logic on virtual destination remove inside of
Advisory Broker to clean up virtual destination maps properly.  Added a
test to verify.  Also added new debug logging to help track down any
future issues.

(cherry picked from commit a2781e3966)
2016-03-09 19:57:00 +00:00
Christopher L. Shannon (cshannon) 369a430538 [maven-release-plugin] prepare for next development iteration 2016-03-01 16:39:41 +00:00
Christopher L. Shannon (cshannon) 6a2e71f11c [maven-release-plugin] prepare release activemq-5.13.2 2016-03-01 16:39:02 +00: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) 9c296ea64a NO-JIRA - adding missing schema identifiers
(cherry picked from commit ebe8cf65a0)
2016-03-01 15:52:58 +00:00
Christopher L. Shannon (cshannon) 1a74ff6c22 https://issues.apache.org/jira/browse/AMQ-6176
Upgrading Saxon version to fix xpath filter errors when using Camel

Thanks to Jamie Goodyear for the patch

(cherry picked from commit d89826bdab)
2016-03-01 15:16:45 +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
Brian D. Johnson 5dfd8cdfa8 https://issues.apache.org/jira/browse/AMQ-6188 - reset BaseDestination.lastActiveTime each time a message is delivered to the broker.
(cherry picked from commit 552c0f0f7a)
2016-02-26 21:03:19 +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
Timothy Bish a4cd137dab https://issues.apache.org/jira/browse/AMQ-6187
Create a proper SSLContext for the MQTT client provider in the tests to
avoid failure on newer JDKs
(cherry picked from commit 6e2edf08c3)
2016-02-26 13:44:27 -05:00
Christopher L. Shannon (cshannon) a1f309ea19 https://issues.apache.org/jira/browse/AMQ-6177
Fixing CronParserTest so that it checks 24 hour format properly when
using a timezone shifted by 30 minutes

Thanks to Jamie Goodyear for the patch

(cherry picked from commit 0f445a535f)
2016-02-22 12:51:51 +00:00
Robert Gemmell e81c32f63c AMQ-6178: update to Qpid JMS 0.8.0
(cherry picked from commit f7941a7fbf)
2016-02-22 11:15:32 +00:00
Jeff Genender 9224f27ba3 AMQ-6175 - Web console needs to only obtain lists of MBeans that are not suppressed. 2016-02-18 14:36:06 -07:00
Timothy Bish ef295414b2 NO-JIRA: Add some additional assertions so tests fail more cleanly in
the case of a receive not getting a message before it's assigned
timeout.
(cherry picked from commit 33e27a4f5a)
2016-02-17 11:35:31 -05:00
Claus Ibsen 0c9fdb5b41 Turn off jolokia discovery by default. 2016-02-17 08:48:09 +01:00
Claus Ibsen 2061186a0a Jolokia should not send back exceptions/error details by default 2016-02-17 08:48:04 +01:00
Claus Ibsen 7828069637 Upgrade jolokia 2016-02-17 08:47:59 +01:00
Robert Gemmell a2786b5ad1 AMQ-6147: update to proton-j 0.12.0 release
(cherry picked from commit 3f7b2d6bb0)
2016-02-16 17:25:13 +00:00
Hiram Chirino da45634e44 Fixes AMQ-5404: LevelDB files not being released after deletion
(cherry picked from commit 9de3fff1f5)
2016-02-16 10:52:59 -05:00
Christopher L. Shannon (cshannon) 028a33ea7d https://issues.apache.org/jira/browse/AMQ-6170
Fixing X-Frame-Options header so that is applied for all content served
by Jetty.  The previous patch wasn't correct because it only applied it
to Servlets and JSPs and not static content. This also reverts AMQ-6113

(cherry picked from commit 24ad367785)
2016-02-12 20:46:27 +00:00
Claus Ibsen 559477285c AMQ-6166: Add option to configure trustAllPackages on Camel ActiveMQ component 2016-02-11 12:09:51 +01:00
Christopher L. Shannon (cshannon) 0715d09a95 https://issues.apache.org/jira/browse/AMQ-6153
Only setting the socketBufferSize in TcpTransport if the value is
greater than 0 as other values are illegal.

(cherry picked from commit 90726a60af)
2016-02-08 16:14:21 +00:00
Timothy Bish 4782feb6a1 https://issues.apache.org/jira/browse/AMQ-6159
Ensure proper repeat counts are scheduled.
(cherry picked from commit 386210fafe)
2016-02-04 17:17:41 -05:00
Christopher L. Shannon (cshannon) 23e9ecaec1 https://issues.apache.org/jira/browse/AMQ-6158
Computing messageSize for a durable subscription in KahaDB now runs much
faster (n vs n^2) which is noticable when there are a large number of
pending messages for a durable subscription.

(cherry picked from commit 25ff5699f1)
2016-02-04 15:23:29 +00:00
Timothy Bish 04b191ceb4 https://issues.apache.org/jira/browse/AMQ-6152
Ensure that when add / remove commands are colocated they don't prevent
the log from being GC'd once it is unreferenced.
(cherry picked from commit 8c4b5f485d)
2016-02-02 20:29:57 -05:00
Christopher L. Shannon (cshannon) 86e51d2461 [maven-release-plugin] prepare for next development iteration 2016-02-02 17:11:44 +00:00
Christopher L. Shannon (cshannon) d60b73402c [maven-release-plugin] prepare release activemq-5.13.1 2016-02-02 17:11:03 +00:00
Christopher L. Shannon (cshannon) 117862b5de NO-JIRA: fixing actimveq-tooling version 2016-02-02 16:39:34 +00:00
Christopher L. Shannon (cshannon) c0b8788c30 adding 5.13.1 schema version 2016-02-02 16:29:34 +00:00
gtully ce604fba78 https://issues.apache.org/jira/browse/AMQ-6151 - respect prioritizeMessages for pending and redelivered messages
(cherry picked from commit 5af5b59d3b)
2016-02-02 16:20:22 +00:00
Christopher L. Shannon (cshannon) aaa2fdd541 https://issues.apache.org/jira/browse/AMQ-6142
Fixing a race condition that exists in the decompress method of
ActiveMQBytesMessage that can cause an invalid length to be read.

(cherry picked from commit 5f7a81f928)
2016-02-01 17:37:32 +00:00
Christopher L. Shannon (cshannon) f514b15713 https://issues.apache.org/jira/browse/AMQ-6150
code cleanup

(cherry picked from commit 161730fda2)
2016-02-01 13:07:45 +00:00
Marc Breslow 0b481903aa Fix Impossible Cast issues in MemoryTopicSub:
- recoverSubscription()
-- map is defined as LinkedHashMap<MessageId, Message>
-- msg is defined as <map> entry.getValue() so must be a Message
-- condition if (msg.getClass() == MessageId.class) could never be true
-- no need to cast at all when using generics

- recoverNextMessages()
-- basically same code copy/pasted so same fix

Removed 2 conditions from ServerSessionPoolImpl that would result in impossible casts. Conditions removed were trying to cast ActiveMQQueueSession and ActiveMQTopicSession to ActiveMQSession which is illegal.

Since it isn't obvious what to do if you get an ActiveMQQueueSession or ActiveMQTopicSession from getServerSession() I make it fall back to the else condition which raises an async exception. This is better than getting a ClassCastException at runtime.

Remove impossible cast in MemoryMessageStore

(cherry picked from commit 4a937def7d)
2016-02-01 13:07:26 +00:00
Christopher L. Shannon (cshannon) 648d08391d https://issues.apache.org/jira/browse/AMQ-6113
Properly set the X-FRAME-OPTIONS header on web responses.

(cherry picked from commit 186b5d0f30)
2016-01-29 21:07:28 +00:00
Christopher L. Shannon (cshannon) 0ebc7a4da8 Revert "https://issues.apache.org/jira/browse/AMQ-6136"
This reverts commit 4ee29c363f.

We need to remove the dependency on Spring DM before doing this

(cherry picked from commit 7eb25ec50b)
2016-01-29 14:58:31 +00:00
Christopher L. Shannon (cshannon) b47d544f3f https://issues.apache.org/jira/browse/AMQ-6138
Adding ACTIVEMQ_USER_CLASSPATH to make the ActiveMQ classpath more
extendable by users.  Also fixinng the classpath parsing to use the
right path separator dependening on the environment.

(cherry picked from commit e0ad700f2c)
2016-01-28 21:12:55 +00:00
Claus Ibsen ef965b5b4a AMQ-6149: Lets pre-configure jolokia in the broker 2016-01-28 19:55:33 +01:00
Christopher L. Shannon (cshannon) e24e285c99 https://issues.apache.org/jira/browse/AMQ-6146
Fixing JSTL tags in the Webconsole

(cherry picked from commit d0f5c27785)
2016-01-28 14:06:33 +00:00
Christopher L. Shannon (cshannon) 4819336923 NO JIRA - removing unintended commit
(cherry picked from commit 27a07431fb)
2016-01-28 11:45:44 +00:00
Claus Ibsen 2c447b54e9 Upgrade Camel 2016-01-28 11:21:13 +01:00
Christopher L. Shannon (cshannon) 0702888830 https://issues.apache.org/jira/browse/AMQ-6143
Updating to taglibs 1.2.3

(cherry picked from commit c6f470266e)
2016-01-27 21:05:54 +00:00
Daniel Kulp 3e3cddc97e Remove a printStackTrace for an exception that is also logged. Produces noise on console 2016-01-27 10:21:32 -05:00
Christopher L. Shannon (cshannon) 957fb85786 https://issues.apache.org/jira/browse/AMQ-6136
Switching the version for Spring in features-core.xml to allow Spring
4.x versions.

(cherry picked from commit 4ee29c363f)
2016-01-21 16:11:07 +00:00
Christopher L. Shannon (cshannon) adc3ba49c2 https://issues.apache.org/jira/browse/AMQ-6133
Fixing the processing of KahaUpdateMessageCommand to add the message to
the store if it doesn't exist, instead of ignoring it.  This will
prevent message loss in certain cases when the KahaDB index has to be
rebuilt.

(cherry picked from commit b4aa53d806)
2016-01-20 17:01:11 +00:00
Timothy Bish 7d3a71a4df https://issues.apache.org/jira/browse/AMQ-6131
Fix check for durable sub with no pending messages during checkpoint
cleanup.
(cherry picked from commit 193f6be687)
2016-01-18 17:45:05 -05:00
Quinn Stevenson 57b65dc8ef Initial Version of activemq-junit
Added configure method to EmbeddedActiveMQBroker

Added support for XBean configuration

(cherry picked from commit da3b138023)
2016-01-18 15:31:01 +00:00
Christopher L. Shannon (cshannon) 6abb5b9bee https://issues.apache.org/jira/browse/AMQ-6129
Fixing DynamicallyIncludedDestinationsDuplexNetworkTest

(cherry picked from commit 1ae29382e1)
2016-01-18 15:29:34 +00:00