Commit Graph

4160 Commits

Author SHA1 Message Date
Bosanac Dejan 12b1bee333 merging 902816 - making ExpiredMessagesTest pass on very slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@902823 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 14:36:06 +00:00
Gary Tully bb98038a9c svn merge -c 902056 https://svn.apache.org/repos/asf/activemq/trunk - resolve intermittent failure of org.apache.activemq.bugs.AMQ2149Test as a result of https://issues.apache.org/activemq/browse/AMQ-2573. An new command to indicate when recovery is complete on a sub is needed to gate dispatch on a recovered connection, can do this for 5.4. An outstanding ack transaction is now ignored but an outstand send transaction can still cause a potential hang till we introduce the new recovery complete command
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@902057 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 11:01:53 +00:00
Bosanac Dejan 08efe64d74 merging 901626 - https://issues.apache.org/activemq/browse/AMQ-2574 - add repository for external spring dependencies
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901630 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 10:00:39 +00:00
Gary Tully 5031408866 svn merge -c 901273 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2573 - rollback of audit check needs to be synced with redispatch after failover transport resumption, otherwise some redispatched unconsumed messages can get auto-acked as duplicates in error
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901274 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 16:53:02 +00:00
Gary Tully 81415b5d1b svn merge -c 901269 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2567
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901271 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 16:44:11 +00:00
Bosanac Dejan 078c1f5180 merging 816444 and 901171 - osgi support and https://issues.apache.org/activemq/browse/AMQ-2574 - stop osgi bundle on application context close
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901177 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 13:11:59 +00:00
Gary Tully 8e74cc8fc9 merge -c 899145 https://svn.apache.org/repos/asf/activemq/trunk - add a few more test variants for inflight: https://issues.apache.org/activemq/browse/AMQ-2566
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900391 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:21:38 +00:00
Gary Tully 97143be545 merge -c 898797 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2566, inflight out of sync after delivery to dlq. Also tidy failover transaction test from: https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900390 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:19:27 +00:00
Bosanac Dejan a7da603c4f merging 900363 - DiscoveryNetworkReconnectTest failures - more fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900389 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:18:13 +00:00
Gary Tully ae6f8020e7 merge -c 898281 https://svn.apache.org/repos/asf/activemq/trunk - resolve intermittent ZeroPrefetchConsumerTest failure - prefetch excension decrement needs to be conditional on prefecth=0, relates to changes to prefetchExtension for https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900386 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:17:40 +00:00
Gary Tully 3a76567b79 merge -c 897988 https://svn.apache.org/repos/asf/activemq/trunk - reduce unmatched ack exceptions, tidy up prefetchExtension https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900385 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:16:34 +00:00
Gary Tully 03fc6ff5bf merge -c 897061 https://svn.apache.org/repos/asf/activemq/trunk - resolve potential lost ack with failover and an in progress consumer transaction that results in an Unmatched ack exception - resolve: https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900384 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:15:23 +00:00
Bosanac Dejan 5a43a94db5 merging 900363 - DiscoveryNetworkReconnectTest failures
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900372 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 12:44:34 +00:00
Gary Tully fb871adbbd merge -c 900318 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2572 - issue with unconsumed prefetched messages being ignored as duplicates - timing issue with consumer close and session dispatch
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900327 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 10:15:28 +00:00
Bosanac Dejan 94f6520eb5 merging 899542 - https://issues.apache.org/activemq/browse/AMQ-2569 - spring.schema update
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@899561 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 08:31:10 +00:00
Bosanac Dejan bf7934f9b7 merging 898812 - https://issues.apache.org/activemq/browse/AMQ-2488 - dynamic osgi import for activemq-core
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@898814 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 15:56:05 +00:00
Robert Davies 3398a6911d remove erronouesly added TempStoreTest.java
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@896118 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 16:25:19 +00:00
Robert Davies b2e171dd72 Merged /activemq/trunk:r881278-881313 - for http://issues.apache.org/activemq/browse/AMQ-2475
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@896063 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 14:22:33 +00:00
Gary Tully 75567e62ce svn merge -c 895975 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2523 - have Usage use a shared executor with a limited pool of 10 threads and an unbounded queue. Fix potential dropped dispatch attempts when messages waiting for space fail due to memory again being full, can result is hung consumer. In this case, a new notification for not full needs to be registered. Added relevant test case.
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@895977 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 10:44:45 +00:00
Bosanac Dejan e7224cef6c merging 894347 - https://issues.apache.org/activemq/browse/AMQ-2553 - browsing dlq over transacted session
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@894389 13f79535-47bb-0310-9956-ffa450edef68
2009-12-29 13:54:03 +00:00
Gary Tully ab87d44e4b svn merge -c 893661 - last piece of https://issues.apache.org/activemq/browse/AMQ-2540 - fix order or audit recovery replay
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@893664 13f79535-47bb-0310-9956-ffa450edef68
2009-12-24 00:41:00 +00:00
Bosanac Dejan 255f3cd229 merging 892816 - adapting jdbc audit test
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@892818 13f79535-47bb-0310-9956-ffa450edef68
2009-12-21 13:32:25 +00:00
Bosanac Dejan 0245609f34 merging 891582,891622,892194,892242,892291,892729,892759: https://issues.apache.org/activemq/browse/AMQ-2473, https://issues.apache.org/activemq/browse/AMQ-2540
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@892781 13f79535-47bb-0310-9956-ffa450edef68
2009-12-21 11:50:56 +00:00
Bosanac Dejan 5fb258e8ea merging 892220 - https://issues.apache.org/activemq/browse/AMQ-2508 - SecurityContext.isInOneOf()
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@892221 13f79535-47bb-0310-9956-ffa450edef68
2009-12-18 11:15:33 +00:00
Colin W Macnaughton 47bd1a4f8c Backport merge of Fix for AMQ-2511: Inactivity monitor does not time out stale connections from https://svn.apache.org/repos/asf/activemq/trunk
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@891816 13f79535-47bb-0310-9956-ffa450edef68
2009-12-17 18:16:29 +00:00
Bosanac Dejan 577f6378fa merging 891786 - https://issues.apache.org/activemq/browse/AMQ-2539 - adding temp destinations and security
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@891790 13f79535-47bb-0310-9956-ffa450edef68
2009-12-17 16:26:01 +00:00
Bosanac Dejan eb1df6f0dd merging 889710 - https://issues.apache.org/activemq/browse/AMQ-2529 - browse over network - cleaning up the test
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@889715 13f79535-47bb-0310-9956-ffa450edef68
2009-12-11 17:28:54 +00:00
Bosanac Dejan e23fa20b43 merging 889677 - https://issues.apache.org/activemq/browse/AMQ-2529 - browse over network
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@889690 13f79535-47bb-0310-9956-ffa450edef68
2009-12-11 16:42:25 +00:00
Bosanac Dejan 0351b5c755 merging 889167 - https://issues.apache.org/activemq/browse/AMQ-2519 - JDBC store and duplicate messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@889169 13f79535-47bb-0310-9956-ffa450edef68
2009-12-10 10:11:24 +00:00
Gary Tully 854479b5d5 svn merge -c 888974 - resolve https://issues.apache.org/activemq/browse/AMQ-2527 - add timeout to waitForSlave and make the following more reseliant to slow machines, VMTransportWaitForTest,MasterSlaveSlaveDieTest,SimpleNetworkTest,NetworkBrokerDetachTest,DuplexNetworkMBeanTest,MultiBrokersMultiClientsTest,AMQ2102Test - related to changes for https://issues.apache.org/activemq/browse/AMQ-1112
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@888988 13f79535-47bb-0310-9956-ffa450edef68
2009-12-09 21:38:23 +00:00
Bosanac Dejan 8a8ad82046 merging 888426 - https://issues.apache.org/activemq/browse/AMQ-2513 - adapting DiscoveryNetworkReconnectTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@888428 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 15:09:36 +00:00
Bosanac Dejan 33b827733a merging 888367 - https://issues.apache.org/activemq/browse/AMQ-2525 - Prevent broker deadlock if jmxconnector start hangs
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@888368 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 12:27:08 +00:00
Bosanac Dejan 6fa5d1456c merging 888333 - https://issues.apache.org/activemq/browse/AMQ-2513 - adding test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@888335 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 11:22:13 +00:00
Bosanac Dejan 4993f82727 merging 888323 - https://issues.apache.org/activemq/browse/AMQ-2513 - JMX bug - javax.management.InstanceNotFoundException
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@888329 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 11:15:27 +00:00
Colin W Macnaughton 65c1d93201 Backport from trunk revision 883458: Adding a blockedProducerWarningInterval attribute to destinations to control the rate at which warnings about blocked producers are generated (otherwise the warnings can flood the log).
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@888227 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 02:27:30 +00:00
Bosanac Dejan ef188be76b merging 886833 - moving JDBCSpringTest to sys tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@887220 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 15:04:54 +00:00
Bosanac Dejan 2787a85ba7 merging 885488 - http://issues.apache.org/activemq/browse/AMQ-1498 - broker recovery missing subscriber
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@886208 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 17:15:12 +00:00
Bosanac Dejan 9360f50b49 merging 885841 - https://issues.apache.org/activemq/browse/AMQ-2519 - duplicate messages and jdbc store
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@885843 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 17:28:31 +00:00
Gary Tully 55dcb0e3e0 svn merge -c 884778 - resolve https://issues.apache.org/activemq/browse/AMQ-2516 - broker send to dlq now uses broker security context so it will bypass the authentication plugin when configured
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@884779 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 08:23:13 +00:00
Bosanac Dejan 3f3030e5f5 merging 884633 - https://issues.apache.org/activemq/browse/AMQ-2515 - Optimized Acknowledgements and interrupted transport
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@884644 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 17:00:49 +00:00
Gary Tully e624508480 svn merge -c 883458 - resolve https://issues.apache.org/activemq/browse/AMQ-2489 - duplicate delivery acks resulted in broker exceptions with client or inividual ack - delivery acks now only for unacked messages - down side is pending messages in broker remain on expiry awaiting ack from ackLaer that dependes on prefetch value - but this is reasonable and to be expected. they will be removed on close or subsequent acks in any event
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@883459 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:46:46 +00:00
Bosanac Dejan 7a97edc865 merging 882126 - https://issues.apache.org/activemq/browse/AMQ-2042
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@882579 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 14:40:13 +00:00
Gary Tully 120a7a10b0 merge -c 882510 - some more resiliance to slow hardware for this test
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@882526 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 12:02:57 +00:00
Bosanac Dejan 79b57b8eb3 merging https://issues.apache.org/activemq/browse/AMQ-2042 - 834922,835373,835412,835833,835888,880792,881221,882144
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@882511 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 11:36:45 +00:00
Gary Tully 60c04597d8 svn merge -c 882136 - resolve https://issues.apache.org/activemq/browse/AMQ-2502, add optional import of pool
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@882157 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 14:24:46 +00:00
Gary Tully e6533f3d40 svn merge -c 882096 - resolve https://issues.apache.org/activemq/browse/AMQ-2487 - usage management of storecursor iterator was broken in that a browse would decrement the usage. memory management across move and retry operations is now correct. modified some tests to validate memory usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@882100 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 10:48:16 +00:00
Bosanac Dejan 3da2ae3091 merging 881274,881277 - https://issues.apache.org/activemq/browse/AMQ-2499 - don't show passwords in log files
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@881332 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 15:20:48 +00:00
Gary Tully 59a5230024 merge -c 880699 - resolve https://issues.apache.org/activemq/browse/AMQ-2492 - patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@880700 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 10:30:48 +00:00
Gary Tully 0bb6df16bd merge -c 880696 - resolve https://issues.apache.org/activemq/browse/AMQ-2493 - patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@880697 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 10:20:15 +00:00
Gary Tully 46c529b133 merge -c 835874 - resolve https://issues.apache.org/activemq/browse/AMQ-2483 and https://issues.apache.org/activemq/browse/AMQ-2028, keep track of outstanding wakeup requests in a queue with regular task runner avoids build up in determintic task runner. Exposed useDeterministicTaskRunner to validate some test that fail with the -DuseDedicatedTaskRunner=true system property. With broker.useDedicatedTask=false, Queues will use pooled executor for dispatch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@835921 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:04:09 +00:00