Commit Graph

9066 Commits

Author SHA1 Message Date
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
Christopher L. Shannon (cshannon) a73ada0629 https://issues.apache.org/jira/browse/AMQ-6097
Fixing JournalCorruptionEofIndexRecoveryTest class

Because of the size being stored in the message order index, the test
testRecoveryAftercorruptionCheckSumExistingIndex was no longer passing
as that test was corrupting the size value in the journal, but not the
size value in the index.  The test now corrupts both values so that the
expect exception occurs again.

(cherry picked from commit 507d40a79f)
2015-12-22 13:14:44 +00:00
Christopher L. Shannon (cshannon) b103932ccd https://issues.apache.org/jira/browse/AMQ-6097
remove un-needed import statements

(cherry picked from commit 370b181099)
2015-12-22 13:14:44 +00:00
Christopher L. Shannon (cshannon) 51aa70eaae https://issues.apache.org/jira/browse/AMQ-6097
Fixing KahaDB so that the correct marshaller is used for the message
keys inside of the message order index.  This will ensure that message
size metrics are accurate.

(cherry picked from commit 246ccb8e04)
2015-12-22 13:14:44 +00:00
Timothy Bish 871f0a6005 https://issues.apache.org/jira/browse/AMQ-6102
Call to the statistics instance of the subscription to reset the
counters.
(cherry picked from commit 564d55023e)
2015-12-21 17:04:47 -05:00
Timothy Bish 7dd2330011 https://issues.apache.org/jira/browse/AMQ-6101
Update to v0.7.0 of Qpid JMS client libraries.
(cherry picked from commit ddd2812279)
2015-12-21 12:48:56 -05:00
Christopher L. Shannon (cshannon) a12c21061e https://issues.apache.org/jira/browse/AMQ-6091
The JavaRuntimeConfigurationBroker can now apply a subset of policy
properties retrospectively to existing destinations versus applying
all properties of the policy update.

(cherry picked from commit a253ad3c71)
2015-12-18 18:22:19 +00:00
Timothy Bish 5c66343bc9 https://issues.apache.org/jira/browse/AMQ-6096
Update proton to latest.
(cherry picked from commit 9ee92a1e16)
2015-12-18 10:38:38 -05:00
Christopher L. Shannon (cshannon) f6c242ad64 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization

(cherry picked from commit b9dcb010f7)
2015-12-16 14:39:27 +00:00
Christopher L. Shannon (cshannon) be38e92753 Adding activemq-5.12.2 to spring.schemas
(cherry picked from commit 09cbfa9477)
2015-12-15 15:13:35 +00:00
Dejan Bosanac 9aa6bdcf6e https://issues.apache.org/jira/browse/AMQ-6077 - define default values (based on system property) for connection factory and object message
(cherry picked from commit eeec0c07b0)
2015-12-15 12:52:00 +00:00
Dejan Bosanac 5e02e305ea https://issues.apache.org/jira/browse/AMQ-6077 - define object message trusted packages on connection factory
(cherry picked from commit 94446e53dc)
2015-12-14 19:12:28 +00:00
Christopher L. Shannon (cshannon) 27b08b03c5 https://issues.apache.org/jira/browse/AMQ-6088
The runtime plugins will now find the exact policy to update which means
that a destination can match more than one policy and the policy can
still be updated at runtime.

The java runtime broker also supports the ability to replace or add a
policy entry based on a flag on a new method call.

(cherry picked from commit 9e7fae0d83)
2015-12-14 19:09:16 +00:00
gtully fc4120e850 https://issues.apache.org/jira/browse/AMQ-6086 - test cannot validate all start failures scenarios at this time, suffice that start and stop complete ok
(cherry picked from commit b7787bf6fb)
2015-12-14 19:09:15 +00:00
gtully b4360c6e0e https://issues.apache.org/jira/browse/AMQ-6086 - avoid logging npe on attempted start of persistence adapter post stop
(cherry picked from commit 455a628305)
2015-12-14 19:09:15 +00:00
gtully 2ffd7498a8 https://issues.apache.org/jira/browse/AMQ-6086 - start exception can prevent stop from exiting fully, need to be more selective in creation on stop.
(cherry picked from commit 35df815fb8)
2015-12-14 19:09:15 +00:00
Dejan Bosanac f3aedc753c https://issues.apache.org/jira/browse/AMQ-6077 - test
(cherry picked from commit 7951037f20)
2015-12-14 19:09:14 +00:00
gtully f8488916c2 revert sync ack send for https://issues.apache.org/jira/browse/AMQ-3519 due to rework in https://issues.apache.org/jira/browse/AMQ-5068 - sync send no longer needed because redelivered flag is persisted before dispatch. This avoids a roundtrip overhead on individual ack, ie priority or nonBlockingRedelivery options in the mix
(cherry picked from commit c78eddce7e)
2015-12-11 17:34:35 +00:00
gtully e5b86116c4 https://issues.apache.org/jira/browse/AMQ-6086 - add some determinism to interleaved stop and start calls on broker service
(cherry picked from commit da076f4a63)
2015-12-11 17:32:06 +00:00
gtully aa2a85abe5 https://issues.apache.org/jira/browse/AMQ-6070 - rework regression - KahaDBStoreRecoveryExpiryTest had NPE in the logs, region dest not set on recovery listener for expiry case
(cherry picked from commit 93092f7ea0)
2015-12-11 17:31:32 +00:00
gtully 9c82756ca9 https://issues.apache.org/jira/browse/AMQ-6083 - resolve some test regressions - AMQ2149Test - fail to start with missing data file. Ensure ack map is always saved on modification
(cherry picked from commit 31d99b6aa9)
2015-12-11 09:53:22 -05:00
gtully 724a0e85f3 https://issues.apache.org/jira/browse/AMQ-6083 - ignore test scenario on leveldb store
(cherry picked from commit 8609f74db3)
2015-12-11 12:34:36 +00:00
gtully 9e8f020301 https://issues.apache.org/jira/browse/AMQ-6005 - have plist whack it existing state on start. Start the temp store after the primary persistence adapter which does the locking
(cherry picked from commit 768fa17085)
2015-12-10 09:46:17 -05:00