9137 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon)
c5e607fcd2 NO-JIRA : Adding 5.13.3 schema identifier
(cherry picked from commit 4e27618ddd85fbaa91610cb4b815c8c686d6a351)
2016-04-26 11:18:43 +00:00
Timothy Bish
0c3d05f2ea 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.
(cherry picked from commit e47edd7a282e1391f480c1278555f4a86e9a8ea9)
2016-04-25 17:05:45 -04:00
Timothy Bish
2796c0f5d7 https://issues.apache.org/jira/browse/AMQ-6126
Ensure the constructors pass along the default value as read from system
property if set.
(cherry picked from commit 3e7847aeada26bf147ca297e79995d43e74fc97d)
2016-04-21 13:15:55 -04:00
Timothy Bish
3bd03c4e18 AMQ-6213 Quote path values to ensure the script works when the path
contains spaces.

This closes #173
(cherry picked from commit 69c5fd7d5a56d13b4be2c56ca8e932c3d06b5d05)
2016-04-20 16:46:27 -04:00
Timothy Bish
48f314ef5a https://issues.apache.org/jira/browse/AMQ-5510
https://issues.apache.org/jira/browse/AMQ-5534

PooledConnectioFactory added reconnection support but can break if the
holder of the connection adds their own ExceptionListener as the
PooledConnection doesn't protect the internal ExceptionListener from
replacement which leads to cases where the loaned Connection is not
automatically closed so that the next create returns the same failed
connection.
(cherry picked from commit b65c0d1be4b0812229d3f166e50d963766856c53)
2016-04-20 09:49:37 -04:00
Timothy Bish
ad07ee4612 https://issues.apache.org/jira/browse/AMQ-5153
https://issues.apache.org/jira/browse/AMQ-6254

Store the original subscribed destination along with the target
destination in the subscription info object to ensure that wildcard
subscriptions remain linked.
(cherry picked from commit b027e655538226b56f1fe277a426e0df41501fc6)
2016-04-19 09:54:46 -04:00
Timothy Bish
46dadf9866 https://issues.apache.org/jira/browse/AMQ-6248
Prevent conccurent calls to handleTransportFailure from closing an
already reconnected transport instance.  
(cherry picked from commit 23a5beb86c3dac151ae3ed242ce506aa0048bd03)

Conflicts:
	activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
2016-04-18 09:53:04 -04:00
Christopher L. Shannon (cshannon)
840583df09 https://issues.apache.org/jira/browse/AMQ-6256
Moving beforeMarshall back to the store implementations because we don't
want all store implementations to marshall (such as memory store)

This reverts commit 32913408a68ec92e3d202f5dcc3923d5c7d7588a.
2016-04-18 12:43:28 +00:00
Christopher L. Shannon (cshannon)
9d545cf11f https://issues.apache.org/jira/browse/AMQ-6222
Reverting the change to move clearMarshalledState into the callback
listener as beforeMarshall is now called before the async message add

Revert 7f5c09f2d77c77f87a47fb738870c5ee5bc78c27
2016-04-18 11:54:38 +00:00
Timothy Bish
2f935a260b https://issues.apache.org/jira/browse/AMQ-5819
Only apply the initialReconnectDelay on the first reconnection attempt
after a connected transport has failed.
(cherry picked from commit c8af70f0949e38270b313b7b8ce305c5870362da)
2016-04-15 12:50:57 -04:00
Christopher L. Shannon (cshannon)
32913408a6 https://issues.apache.org/jira/browse/AMQ-6256
Moving beforeMarshall call out of the store and into the actual
destination

(cherry picked from commit b9b98a45cee484b112dadeffa2d9a874c4ffe280)
2016-04-15 14:22:15 +00:00
Christopher L. Shannon (cshannon)
dc3c5a719b https://issues.apache.org/jira/browse/AMQ-6256
Calling beforeMarshall on messages when they async stored before the
store task is run and before consumer dispatch to prevent two threads
from trying to mutate the message state at the same time.

(cherry picked from commit b9f9f03829a65efa2956c347d2cafa41905313c6)
2016-04-15 13:06:51 +00:00
Christopher L. Shannon (cshannon)
4a3fa320e7 Revert "https://issues.apache.org/jira/browse/AMQ-6218"
This reverts commit 93bc7030e263d6ed5bab7b778b15d50d46fe2c66.
2016-04-15 13:05:06 +00:00
Timothy Bish
cb6c7fb423 https://issues.apache.org/jira/browse/AMQ-6252
Update for some added thread safety.  Adds method healthStatus that will
regenrate the status from the healthList data which is more intuitive
than the getCurrentStatus which doesn't update state and requires
periodic calls to healthList to capture current metrics.
(cherry picked from commit 19fd084a83c990f9fb75a5f2becb48ac808a1b36)
2016-04-14 16:53:51 -04:00
Christopher L. Shannon (cshannon)
61dc688804 https://issues.apache.org/jira/browse/AMQ-6250
Checking for null before closing the journal in
MultiKahaDBPersistentAdapter.  Also protecting against multiple calls to
start and stop.
2016-04-14 18:42:08 +00:00
Timothy Bish
aea8d453fd https://issues.apache.org/jira/browse/AMQ-6246
Fix loop to not skip the composite split code.
(cherry picked from commit 15dc6cc7659bfacf3ca10c490466a2cf2d3c54de)
2016-04-13 18:54:27 -04:00
Timothy Bish
857254b75b https://issues.apache.org/jira/browse/AMQ-6245
Don't log the pull timed out messages that might still be in the
unconsumed list during rollback of unconsumed messages
(cherry picked from commit aaecdff8b485dc1baf84110375d4b9ffa6f68c19)
2016-04-13 16:59:39 -04:00
Brian D. Johnson
7894d8a9a1 https://issues.apache.org/jira/browse/AMQ-6244 - reset ActiveMQBytesMessage 'compressed' flag after restoring compressed content
(cherry picked from commit 7a61718e0255728b7a822b25fcf75a030be14359)
2016-04-13 15:22:32 +00:00
Christopher L. Shannon (cshannon)
3e2bd6d2a6 NO-JIRA - Adding activemq-junit dependency to activemq-unit-tests 2016-04-13 13:22:31 +00:00
Timothy Bish
7575ff67ff https://issues.apache.org/jira/browse/AMQ-6178
https://issues.apache.org/jira/browse/AMQ-6147

Update Qpid JMS to v0.9.0 and Qpid Proton to 0.12.1
(cherry picked from commit 332a8225fa70026ec3dda9804de48ae7e3dc4901)
2016-04-12 13:58:19 -04:00
Christopher L. Shannon (cshannon)
91f05189ab https://issues.apache.org/jira/browse/AMQ-6203
Disabling Ack Compaction by default for 5.13.x
2016-04-12 13:31:56 +00:00
Christopher L. Shannon (cshannon)
b8ac1b4c56 https://issues.apache.org/jira/browse/AMQ-6203
Adding a flag to enable or disable Ack Compaction
Currently defaults to enabled for 5.14.0 and above

(cherry picked from commit cbad8babe507f63cc80e42fe37070b898d4d8dbc)
2016-04-12 13:31:35 +00:00
Timothy Bish
72eecbe260 https://issues.apache.org/jira/browse/AMQ-6203
Expose configuration on the persistence adapter level.
Double the test timeout and increase the compaction frequency to account
for very slow CI boxes.
(cherry picked from commit a9521dcebfb4e469dde7465ff95d8e8f1f050abd)
2016-04-12 12:34:27 +00:00
Timothy Bish
2a7255ab2c https://issues.apache.org/jira/browse/AMQ-6203
Rewrite older acks that can be preventing GC of log files.
(cherry picked from commit 946e62d702d2bf5fbcdb0ed4cb6977046acb659b)
2016-04-12 12:33:17 +00:00
Christopher L. Shannon (cshannon)
20e84d63e0 https://issues.apache.org/jira/browse/AMQ-6142
Moving the bytes copy to the parent Message class to solve this this
issue for all message types as that is the root cause

(cherry picked from commit e69c2cbad6611fa355bd9eb592f03bd3b8f90abb)
2016-04-11 12:33:04 +00:00
Christopher L. Shannon (cshannon)
078da5e7f8 Revert "https://issues.apache.org/jira/browse/AMQ-6221"
This reverts commit 6c2a825ebb516e9b37cdb913800de0306ed7e670.
2016-04-11 12:19:15 +00:00
gtully
6c79298541 https://issues.apache.org/jira/browse/AMQ-6151 - retain list for redeliveries and combine for dispatch/iteration such that redeliveries retain per priority order after prefetch
(cherry picked from commit 2a8218a9a8cfa74e1049249481f601e042f33358)
2016-04-06 11:20:21 -04:00
gtully
06972183f9 https://issues.apache.org/jira/browse/AMQ-6215 - support 0 maxBrowsePageSize and maxExpirePageSize such that lazyDispatch ensures highest priority messages is available to a pull consumer
(cherry picked from commit a3a8c1c5256aa8ea1067afe3e1586832e5aa1821)
2016-04-06 11:20:07 -04:00
Christopher L. Shannon (cshannon)
8393e6b8ea https://issues.apache.org/jira/browse/AMQ-6133
Disabling async queue message store when persistJMSRedelivered is turned
on for a destination.  That flag will cause a sync update later on
dispatch which can cause a race condition if the original message add is
processed after the update.  This can cause a duplicate message to be
stored.

(cherry picked from commit b2327db3b79dffd42fd5c6ba85720a5d9c302052)
2016-04-01 16:51:20 +00:00
Christopher L. Shannon (cshannon)
7f5c09f2d7 https://issues.apache.org/jira/browse/AMQ-6222
Moving clearedMarshalledState execution to the async listener on an
async add to the message store.  This is necessary to make sure this
logic doens't execute until after the message is marshalled for the
store.

(cherry picked from commit 75990ef14a092b629bf8d2127bc4786e51b31684)
2016-03-22 18:55:57 +00:00
Christopher L. Shannon (cshannon)
6c2a825ebb https://issues.apache.org/jira/browse/AMQ-6221
Synchronizing ActiveMQText message on state changes for the content and
text fields so that they are always changed together.  This will prevent
race conditions where data can be lost when using concurrent store and
dispatch.

(cherry picked from commit e0c549996479c2a1ccf70029ad4462cb987650f6)
2016-03-22 18:51:12 +00:00
Christopher L. Shannon (cshannon)
93bc7030e2 https://issues.apache.org/jira/browse/AMQ-6218
Fixing copy method of ActiveMQTextMessage to prevent a race condition
when concurrent store and dispatch is used with Queues

We may need explicity synchronization between the text and content fields
in the future if other issues pop up

(cherry picked from commit ea09159a4087212964787e7cf68ef30170d115f0)
2016-03-21 19:42:00 +00:00
Christopher L. Shannon (cshannon)
531634fca1 https://issues.apache.org/jira/browse/AMQ-6214
Fixing ReloadableProperties so that the groups file will be properly
reloaded on file modification. Added a test to verify.

Thanks to Nanchang Yang for providing the fix.

(cherry picked from commit 2788bd55845d35ffb753f20ea1fee9711e85fe43)
2016-03-16 14:51:44 +00:00
Timothy Bish
e0081014bf https://issues.apache.org/jira/browse/AMQ-6108
Update the threads created by the SelectorManager to be daemon threads. 
(cherry picked from commit e2b4ca2c59a316be91cf391c758a10e518dd3a1f)

Conflicts:
	activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
2016-03-15 14:06:09 -04:00
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 4bd9a4ef6f29399ebde61275db75cf8d5d323ffc)
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 b39ab7867c208a967090eff189594c2b06dafb34)
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 a2781e3966ded41a241d24ffb8d85d410c39eb21)
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 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 e375af3810aa3ae0cc87c9a4b7400e9730ad65c2)
2016-03-01 16:02:38 +00:00
Christopher L. Shannon (cshannon)
9c296ea64a NO-JIRA - adding missing schema identifiers
(cherry picked from commit ebe8cf65a072c3be66e04a5c8172f9acc16a7c33)
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 d89826bdab820bd399180c3c150cef9d82af3565)
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 473b3284d42613b117bd5103d59435ab46f0c420)
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 7335f699f2a8eafa1c103f9ff3f3d1202572523d)
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 552c0f0f7a7502c0337b13699de51a11b29723a2)
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 4fb808397759b5569f8e8b49a486026aeaeecac2)
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 6e2edf08c3e3dda7656dffa1af8c92b6ed333c22)
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 0f445a535f8ec1135d6769a9e7c1503fd7b26121)
2016-02-22 12:51:51 +00:00
Robert Gemmell
e81c32f63c AMQ-6178: update to Qpid JMS 0.8.0
(cherry picked from commit f7941a7fbf55137ecdf3430e1846ecee9d9c4b4f)
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