Commit Graph

4244 Commits

Author SHA1 Message Date
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
Gary Tully df8d3d4a63 merge -c 835715 Fix for http://issues.apache.org/activemq/browse/AMQ-2439: IllegalState issue.
Tightening synchronization in DemandForwardingBridge to avoid subscription clean up and ack processing race condition.

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@835920 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:00:14 +00:00
Bosanac Dejan 9bd267ed8d merging 835816 - https://issues.apache.org/activemq/browse/AMQ-2486 - systemExitOnShutdown hang
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@835820 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 11:40:18 +00:00
Bosanac Dejan 50a0402e55 merging 835339 : https://issues.apache.org/activemq/browse/AMQ-2486 - systemExitOnShutdown hangs
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@835342 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 11:35:03 +00:00
Gary Tully 2a07b408ee svn merge -c 835325 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2487, patch applied, test added
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@835329 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 10:48:39 +00:00
Gary Tully e150757421 merge -c 834543 - resolve https://issues.apache.org/activemq/browse/AMQ-2481 - no need to force a page in but sync between expiry from browse and from pageIn needed some tweaks, expired messages need to be removed from the cursor in the event of expiry from browse. Also resolve unit test failures from https://issues.apache.org/activemq/browse/AMQ-2481
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@834557 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:26:38 +00:00
Bosanac Dejan a1dca0e242 merging 833441: additional fix for https://issues.apache.org/activemq/browse/AMQ-2306 - jmx for slave brokers
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@833442 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 15:33:13 +00:00
Bosanac Dejan 49f3a70a1d merging 833395: https://issues.apache.org/activemq/browse/AMQ-2306 - jmx for slave brokers
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@833402 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 14:09:13 +00:00
Bosanac Dejan 40ce72ffca merging 832701 - https://issues.apache.org/activemq/browse/AMQ-2410 - web console sorting
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@832710 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 11:32:00 +00:00
Gary Tully 5bdb08c4f2 merge -c 832454 - provide repo ref for net.sf.josql dependency not yet in central
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@832458 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 15:38:09 +00:00
Bosanac Dejan 84d71fcb3c merging 831942: https://issues.apache.org/activemq/browse/AMQ-2474 - Enable broker-to-broker authentication and authorizarion using SSL certificates and jaasCertificateAuthenticationPlugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@831968 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 16:46:45 +00:00
Bosanac Dejan cd96d29a93 merging 825008: https://issues.apache.org/activemq/browse/AMQ-2449 Peer certificates not propagated when using stomp+ssl w/mutual authentication
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@831960 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 16:39:08 +00:00
Gary Tully 2a4590527d svn merge -c 831827 https://svn.apache.org/repos/asf/activemq/trunk - https://issues.apache.org/activemq/browse/AMQ-2472
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@831829 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 09:05:17 +00:00
Gary Tully 20c0ba689a merge -c 831258 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2468 - limit pagedInPendingDispatch to maxPageSize and bypass dispatch for jmx queue modifications like purge and remove matching messages so they are not limited by pending messages and can page through all messages. Resolve intermittent deadlock in AMQ2102Test. Note: sparse selectors may need to increase maxPageSize as ever increasing pagedInPendingDispatch was exceeding that limit in error
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@831266 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 11:23:06 +00:00
Gary Tully 963ef01ab8 svn merge -c 831008 https://svn.apache.org/repos/asf/activemq/trunk - first cut of resolution to https://issues.apache.org/activemq/browse/AMQ-2470 - put cleanup on a fixe rate schedual
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@831012 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 16:17:32 +00:00
Bosanac Dejan 61ff529a88 merging 830122 - https://issues.apache.org/activemq/browse/AMQ-2466 - josql osgi
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@830128 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 10:49:43 +00:00
Gary Tully f37ec17d47 merge -c 829105 - resolve https://issues.apache.org/activemq/browse/AMQ-2463 - new isolationlevel int property on JDBCPersistenceAdapter
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@829113 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 16:04:38 +00:00