Commit Graph

4236 Commits

Author SHA1 Message Date
Bosanac Dejan f3feac887e [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@924800 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 14:22:56 +00:00
Bosanac Dejan b0b9c7a1c8 [maven-release-plugin] prepare release activemq-5.3.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@924798 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 14:22:47 +00:00
Bosanac Dejan 8c6544276d merge -c 924763 - https://issues.apache.org/activemq/browse/AMQ-2448 - temp workaround for network connector leak
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@924782 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 14:03:43 +00:00
Bosanac Dejan 535f1f52a3 merging 924752 - https://issues.apache.org/activemq/browse/AMQ-2594 - proper init of broker and store seq
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@924753 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 13:07:20 +00:00
Bosanac Dejan 9ec58511aa merge -c 924709 - cleaning log4j.properties
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@924710 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 11:13:00 +00:00
Bosanac Dejan a89088f4d9 merge -c 924353 - https://issues.apache.org/activemq/browse/AMQ-2654 - subscription info space character
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@924356 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 16:28:04 +00:00
Bosanac Dejan 7886cd88e4 merging 924325 https://issues.apache.org/activemq/browse/AMQ-2448 - activemq camel component causes thread leaks
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@924330 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 15:17:17 +00:00
Bosanac Dejan a976ca3883 merging 923706 - https://issues.apache.org/activemq/browse/AMQ-2594 - jdbc out of order messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@923707 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 12:24:32 +00:00
Bosanac Dejan 753646d68b merging 923300 and 923694 - https://issues.apache.org/activemq/browse/AMQ-2594 - jdbc order of messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@923699 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 11:46:50 +00:00
Robert Davies db9c6f13c5 Applied patch for https://issues.apache.org/activemq/browse/AMQ-2191
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@921844 13f79535-47bb-0310-9956-ffa450edef68
2010-03-11 13:34:55 +00:00
Bosanac Dejan f3d4034e2a merge -c 921414 - https://issues.apache.org/activemq/browse/AMQ-2613 - spring filter mapping changes, breaks broker info on the / url
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@921417 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 16:03:24 +00:00
Bosanac Dejan 6c9b04a8db merge -c 921354 - https://issues.apache.org/activemq/browse/AMQ-2393 - camel 2.0.0 fix is not needed anymore after upgrade to 2.2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@921357 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 14:12:57 +00:00
Bosanac Dejan 21fc45e3d9 merging 897262,897939,898774,916762,916780,920325,920330,920827,920838,920881 - https://issues.apache.org/activemq/browse/AMQ-2440 - stomp+nio
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@921318 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 11:48:08 +00:00
Bosanac Dejan b8ddf93692 merge -c 921291 - https://issues.apache.org/activemq/browse/AMQ-2440 - add commons-management dependency needed for camel 2.2.0 web app
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@921295 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 10:45:35 +00:00
Gary Tully 249adf75b6 undo additional tests committed in error with r918386
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918966 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 12:31:01 +00:00
Gary Tully 6973173fa2 merge -c 906697 https://svn.apache.org/repos/asf/activemq/trunk - allow for transaction rolledback exception: https://issues.apache.org/activemq/browse/AMQ-2590
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918951 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 11:49:14 +00:00
Gary Tully 2c34828a34 merge -c 917628 https://svn.apache.org/repos/asf/activemq/trunk - test improvement
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918437 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 12:15:57 +00:00
Gary Tully 55d22d081a keep spring 2.5.6 dependency, but compatibility with spring 3.0 shold be sorted w.r.t config validation and camel dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918419 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 11:17:23 +00:00
Gary Tully 0bfaa3d07c merge -c 917534,917645 https://svn.apache.org/repos/asf/activemq/trunk - camel 2.2.0 for spring 3.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918415 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 11:15:40 +00:00
Gary Tully 950251e925 merge -c 916937, 917556 https://svn.apache.org/repos/asf/activemq/trunk - ensure config will validate, spring 3.0 enforces this so this allows easy compatibility
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918405 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 11:05:34 +00:00
Gary Tully 6ceab80bbe merge -c 918381 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2630 - added test and restricted imlementation
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918388 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 10:35:17 +00:00
Gary Tully 9af5cfcdcc merge -c 918384 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2635
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918386 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 10:31:19 +00:00
Bosanac Dejan f7c1e457b6 https://issues.apache.org/activemq/browse/AMQ-2547 - fixing jetty.xml and merging some visual improvs to the web apps
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@916760 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 17:06:53 +00:00
Bosanac Dejan b68b19c9bb merging 916651 + update jetty config - https://issues.apache.org/activemq/browse/AMQ-2547 - spring 3.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@916709 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 15:14:26 +00:00
Bosanac Dejan ba6e62c1c3 merging 910238,911784 - https://issues.apache.org/activemq/browse/AMQ-2599 - Distribution activemq.xml does not match distribution activemq.xsd
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@916686 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 14:15:44 +00:00
Bosanac Dejan a6d381f459 merging 908182,908373 - https://issues.apache.org/activemq/browse/AMQ-2601 - Make amq blueprint friendly
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@916678 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 13:42:34 +00:00
Gary Tully 0c042c361e merge -c 915770,915809 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2626
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@915914 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 18:36:35 +00:00
Bosanac Dejan 1f464b9412 merging 915269,915384 - https://issues.apache.org/activemq/browse/AMQ-2613 - XSS and CSRF vunerabilities
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@915387 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 15:38:26 +00:00
Robert Davies e440e903e2 fixed failing test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@915014 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 18:48:10 +00:00
Robert Davies 565a97f98c Fix for https://issues.apache.org/activemq/browse/AMQ-2616
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@912656 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 17:03:36 +00:00
Robert Davies b38dbba8c5 Fix for https://issues.apache.org/activemq/browse/AMQ-2533
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@912497 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 07:06:55 +00:00
Robert Davies db5715063f /activemq/trunk:r911812-912087 - improvement for Durable Topic performance for KahaDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@912216 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:25:21 +00:00
Bosanac Dejan 30df8a0a52 merging 911799,911811 - https://issues.apache.org/activemq/browse/AMQ-2510 - adding 'deploy' profile to be used to deploy sources and java docs from hudson
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@911820 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 14:28:20 +00:00
Gary Tully 19ccd1dfd6 merge -c 911650 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2610 - org.apache.activemq.broker.region.cursors.PendingMessageCursor.next() now increments the reference count before returning a message reference. this allows control over references when browsing or peeking rather than moving/removing
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@911759 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 09:35:16 +00:00
Gary Tully 37cacf15bd tidy up merge conflicts with r908453 and include merge -c 909298 https://svn.apache.org/repos/asf/activemq/trunk for r910315
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@911524 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 18:48:11 +00:00
Gary Tully 7dde293ea5 tidy up merge 908453, revert for this file to fix compliation error, reference to new method committed in error
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@911505 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 18:14:57 +00:00
Gary Tully b78be5000b merge -r910315 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2607
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@911417 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 14:26:44 +00:00
Bosanac Dejan 9b500a87a2 merge -c 910984 - https://issues.apache.org/activemq/browse/AMQ-2611 - camel context and connections
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@910986 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 14:19:34 +00:00
Gary Tully 228e8a8f54 merge -c 910637 https://svn.apache.org/repos/asf/activemq/trunk - resolve Locale dependent toUpperCase in IntrospectionSupport. - AMQ-2608
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@910945 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 12:18:55 +00:00
Gary Tully 29bed59c9a merge -c 904243 https://svn.apache.org/repos/asf/activemq/trunk - Fix for AMQ-2586 Topics will now report a queue size of 0.
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@910942 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 12:14:45 +00:00
Guillaume Nodet b6dba99049 AMQ-2602: avoid activemq osgi bundles to import their own packages
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@908906 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 09:58:24 +00:00
Gary Tully 583599e58e merge -c 907174 https://svn.apache.org/repos/asf/activemq/trunk - https://issues.apache.org/activemq/browse/AMQ-2590 - ensure beforeEnd is called once per transaction so ack on rollback is avoided, add more tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@908455 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 11:36:23 +00:00
Gary Tully 3d47544f66 svn merge -c 906450 https://svn.apache.org/repos/asf/activemq/trunk - further evolution of resolution for https://issues.apache.org/activemq/browse/AMQ-2590 - indoubt transactions are now rolledback, pending transactions can wait for jms.consumerFailoverRedeliveryWaitPeriod for redeliveries before rolling back. If previously delivered messages are not replayed the transaction is rolledback
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@908453 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 11:34:35 +00:00
Gary Tully 9a026a53ab svn merge -c 908060 https://svn.apache.org/repos/asf/activemq/trunk, svn merge -c 908121 https://svn.apache.org/repos/asf/activemq/trunk - resolve failure of JDBCStoreBrokerTest on slow machines, identified a sync issue with dispatch to queue browsers. Tidied up dispatch of queue browser to tie it to normal dispatch and avoid the timing/sync issue, browser snapshot of paged in messages is only guaranteed to be > pageSize, test should assert that only
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@908437 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 10:17:50 +00:00
Timothy A. Bish dab19a3c7d https://issues.apache.org/activemq/browse/AMQ-2352 JMX user / pass swapped fix
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@908093 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 16:06:01 +00:00
Gary Tully 89ba76adb6 merge -c 831876 https://svn.apache.org/repos/asf/activemq/trunk - http://svn.apache.org/viewvc?view=revision&revision=831876 - make networkbridge tests more resilient to time related issues on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@907647 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 12:58:02 +00:00
Bosanac Dejan 223daf0eb5 merging 906071,906300,906301 - https://issues.apache.org/activemq/browse/AMQ-2490 - JMSXUserID not propogated to STOMP consumer
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@907613 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 10:46:17 +00:00
Bosanac Dejan 5efd8b9172 merge -c 907604 - DurableConsumerTest - hopefully the last increase of wait time
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@907606 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 09:52:41 +00:00
Bosanac Dejan 7c67c2cf46 merge -c 907595 - https://issues.apache.org/activemq/browse/AMQ-2594 - fixing test exclusion pattern
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@907597 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 09:37:18 +00:00
Bosanac Dejan 2e43fa3a2b merge -c 906983 - DurableConsumerTest - give it even more time to complete on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906985 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 16:02:37 +00:00