Commit Graph

9088 Commits

Author SHA1 Message Date
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
Claus Ibsen d5101d46a7 Polished 2016-01-17 10:21:34 +01:00
Christopher L. Shannon (cshannon) 24a9fa79f4 https://issues.apache.org/jira/browse/AMQ-6129
fixing typo

(cherry picked from commit 7b7e362465)
2016-01-15 15:13:26 +00:00
Christopher L. Shannon (cshannon) 087e5da254 https://issues.apache.org/jira/browse/AMQ-6129
Adding NetworkBridgeStatistics and also a received count for bridges
when they are in duplex mode.

(cherry picked from commit 10c998b0bc)
2016-01-15 14:58:30 +00:00
Timothy Bish 1d9fdbcbea https://issues.apache.org/jira/browse/AMQ-6108
Ensure that executor threads are created as daemon threads, fix a
try/finaly block, clean up some warnings.
(cherry picked from commit 5adbafef3b)
2016-01-14 16:47:59 -05:00
gtully 741ee01e11 https://issues.apache.org/jira/browse/AMQ-6124 - fix and test - propagate broker info from prestarted backup transport
(cherry picked from commit db1506a592)
2016-01-14 15:57:55 +00:00
Altaflux aa8b64420b Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
(cherry picked from commit 6b1e87410d)
2016-01-14 15:57:41 +00:00
Timothy Bish 543851ba54 https://issues.apache.org/jira/browse/AMQ-6126
Add more configuration options to TaskRunnerFactory
(cherry picked from commit ebcc1b4eae)
2016-01-14 10:43:56 -05:00
Timothy Bish b32be1bb11 https://issues.apache.org/jira/browse/AMQ-6125
Ensure that the redelivery policy is never null in the consumer.
(cherry picked from commit 9287055338)
2016-01-13 18:09:54 -05:00
Timothy Bish b04cfeb8af https://issues.apache.org/jira/browse/AMQ-6059
Ensure that a message sent to the store for the DLQ is rewritten so that
its updated values are written to prevent exirpation loops and loss of
reollback cause etc.
(cherry picked from commit 505a76a8bb)
2016-01-12 12:00:41 -05:00
Timothy Bish b4405bed5e AMQ-6121
AMQ-6122

Prevent messages on DLQ for looping back onto the same DLQ.  Prevents
expired messages from bouncing back and duplicate messages from the
store from causing a deadlock.
(cherry picked from commit 66cfc7bab3)
2016-01-12 12:00:26 -05:00
Claus Ibsen a558f8d4f1 Polished 2016-01-11 13:35:32 +01:00
Christopher L. Shannon (cshannon) 2f062488c3 https://issues.apache.org/jira/browse/AMQ-6112
Fixing file permissions in assembly tar.  Some permissions were not
being set explicitly which means the value used could change depending
on where the assembly was built. Permissions are now being set to fix
this.

(cherry picked from commit 43d493e527)
2016-01-07 15:39:14 +00:00
gtully 26665fa1b9 https://issues.apache.org/jira/browse/AMQ-6094 - regression via https://issues.apache.org/jira/browse/AMQ-6014 - incorrect ref count on message expiry event during cursor move for dispatch. Fix and test - thanks for the test
(cherry picked from commit e3df09b9db)
2016-01-05 14:33:43 +00:00
Christopher L. Shannon (cshannon) 63f045e5c9 https://issues.apache.org/jira/browse/AMQ-6109
The chooseValue method in DestinationMap will now always return the
exact match, if there is one, else it will then sort as before.

(cherry picked from commit 8e2176d93c)
2015-12-29 12:46:59 +00:00
Christopher L. Shannon (cshannon) bf3c5e7873 https://issues.apache.org/jira/browse/AMQ-6104
Updating to Spring framework 4.1.9.RELEASE

(cherry picked from commit 35627d9d68)
2015-12-22 15:49:02 +00:00