Commit Graph

6896 Commits

Author SHA1 Message Date
Timothy A. Bish 2dd8b61a4b Add one fix from: https://issues.apache.org/jira/browse/AMQ-4268
need to ensure at least one consumer cycle to ensure the redelivery flag is set. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437691 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 20:09:43 +00:00
Hiram R. Chirino 0dfa5f483c Avoid logging error messages when an AMQP client gracefully disconnects.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437550 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 16:36:37 +00:00
Hiram R. Chirino 3602973cae Use an escape code for the unicode char to keep java sources using ascii characters.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437440 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 15:04:03 +00:00
Hiram R. Chirino 77312e5a64 Fixes AMQ-4258: Endless loop when received incorrect AMQP message
Applied patch sumbitted by Robert Balent.  Many thanks!



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437427 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 14:54:15 +00:00
Bosanac Dejan 77c0cf9206 https://issues.apache.org/jira/browse/AMQ-4034 - copy all neccessary resources to activemq-osgi bundle
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437368 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 12:37:13 +00:00
Timothy A. Bish 5ffb7a849a apply patch for: https://issues.apache.org/jira/browse/AMQ-4266
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437049 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 17:01:36 +00:00
Timothy A. Bish 144be7c277 Apply patch with updates for: https://issues.apache.org/jira/browse/AMQ-4265
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437038 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 16:40:46 +00:00
Bosanac Dejan 8bf0e43ed3 https://issues.apache.org/jira/browse/AMQ-4034 - update data property in test config
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436968 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 14:42:32 +00:00
Bosanac Dejan a6bceeb6da https://issues.apache.org/jira/browse/AMQ-4034 - support configuration properties
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436956 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 14:34:16 +00:00
Claus Ibsen 06e67e02bb Use osgi 4.3.1 which works better with java7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436860 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 12:08:38 +00:00
Bosanac Dejan f0fce84c02 https://issues.apache.org/jira/browse/AMQ-4034 - moving service factory to activemq-osgi module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436832 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 10:41:26 +00:00
Bosanac Dejan 33c564259c https://issues.apache.org/jira/browse/AMQ-4034 - moving service factory to activemq-osgi module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436831 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 10:39:23 +00:00
Bosanac Dejan fd46439e7e https://issues.apache.org/jira/browse/AMQ-4034 - adding logging and proper shutdown on destroy
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436827 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 10:07:36 +00:00
Timothy A. Bish a30dd30114 Add missing folder that's causing the build to fail locally and in Hudson.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436429 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 15:49:15 +00:00
Bosanac Dejan 503d3c3fd1 https://issues.apache.org/jira/browse/AMQ-4034 - adding dependency resources to the osgi jar
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436379 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 14:43:57 +00:00
Gary Tully 0dcdab784b https://issues.apache.org/jira/browse/AMQ-4172 - resolve with test. inflight transactions need to just protect a data file range rather than all subsequent data files. so gc can reclaim what is valid
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436291 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 11:37:23 +00:00
Bosanac Dejan f5360a727d resolve leveldb store jmx issues and use the proper mbean naming
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1435163 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 14:38:01 +00:00
Bosanac Dejan 94f71ccf40 https://issues.apache.org/jira/browse/AMQ-4034 -first step on fixing features and creating a osgi service factory for the broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1435065 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 10:12:11 +00:00
Timothy A. Bish f5d8a05ed7 apply patch for: https://issues.apache.org/jira/browse/AMQ-4260
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434956 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 23:21:54 +00:00
Timothy A. Bish 5d4d7487e4 Add some methods for creating destination queries
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434926 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 21:43:10 +00:00
Gary Tully 1cd3bd8d95 add license header
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434909 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 20:42:46 +00:00
Gary Tully aa1310c70c add PersistenceAdapterView
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434906 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 20:41:40 +00:00
Gary Tully 3bffaf7e4c rudimentary generic persistence adapter mbean view - help show data and transaction info - usefull when blocked on usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434903 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 20:40:23 +00:00
Timothy A. Bish 1898869fbc apply patch for: https://issues.apache.org/jira/browse/AMQ-4121
Allows for more user customization of MemoryUsage if desired.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434849 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 18:27:51 +00:00
Timothy A. Bish 90790952d6 fix test breakage after: https://issues.apache.org/jira/browse/AMQ-3833
Depending on timing of events in the test the producer audit can land on the last log file so there can be one or two left.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434514 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 00:13:40 +00:00
Timothy A. Bish 735f2c034d fix test breakage after: https://issues.apache.org/jira/browse/AMQ-3833
The producerAudit is only written out on change so in this test it holds onto another log file meaning there are two left instead of one.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434074 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 18:10:36 +00:00
Timothy A. Bish f551570d4c fix test breakage after: https://issues.apache.org/jira/browse/AMQ-3833
The producerAudit is only written out on change so in this test it holds onto another log file meaning there are two left instead of one.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434067 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 18:04:31 +00:00
Timothy A. Bish 59d13ad913 fix test breakage after: https://issues.apache.org/jira/browse/AMQ-3833
The producerAudit is only written out on change so in this test it holds onto log 5 meaning there are two left instead of one.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434055 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 17:24:38 +00:00
Bosanac Dejan 1b27f95393 https://issues.apache.org/jira/browse/AMQ-4034 - fixing activemq-broker feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433970 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 15:05:53 +00:00
Claus Ibsen a0f785a758 AMQ-4252: OSGi JARs in activemq-spring is provided and optional.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433835 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 06:47:08 +00:00
Timothy A. Bish 7011ea5b13 fix for: https://issues.apache.org/jira/browse/AMQ-4254
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433683 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 21:53:43 +00:00
Bosanac Dejan eff119471d https://issues.apache.org/jira/browse/AMQ-4034 - first stab at karaf integration tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433543 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 17:29:20 +00:00
Claus Ibsen 85aa6b2401 xbean version range for xbean should be 3.12 as minimum
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433335 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 10:08:00 +00:00
Claus Ibsen 38f24afbd5 AMQ-4257: Upgraded to Aries Blueprint 1.0.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433333 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 10:03:18 +00:00
Claus Ibsen d8766963a9 AMQ-4256: Upgraded to OSGi 4.3.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433328 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 09:42:20 +00:00
Claus Ibsen 359d8ebcfa AMQ-4252: OSGi JARs in activemq-spring is provided and optional.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433323 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 09:33:41 +00:00
Timothy A. Bish 4d37271c5a apply patch for: https://issues.apache.org/jira/browse/AMQ-4254
Add call to broker.waitUntilStopped() to try to make this pass more often. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433209 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 23:16:37 +00:00
Timothy A. Bish 15598081a1 apply patch for: https://issues.apache.org/jira/browse/AMQ-4249
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433159 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 21:51:45 +00:00
Timothy A. Bish af8f5f9ec9 apply patch for: https://issues.apache.org/jira/browse/AMQ-4254
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433024 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 18:26:57 +00:00
Timothy A. Bish a25df91fcd https://issues.apache.org/jira/browse/AMQ-4253
update spring version 3.1.1-RELEASE

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432997 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 17:16:45 +00:00
Timothy A. Bish 1958aeb069 https://issues.apache.org/jira/browse/AMQ-4248
Don't swallow the exception.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432963 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:57:05 +00:00
Timothy A. Bish ae61847d02 https://issues.apache.org/jira/browse/AMQ-4248
Add expanded transmit callback interface so that a failure to transmit can be distinguished from normal operation and allow for no further attempts at dispatch fixing the current NPE when async dispatch is enabled. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432487 13f79535-47bb-0310-9956-ffa450edef68
2013-01-12 18:13:27 +00:00
Claus Ibsen 2a5d0821b1 AMQ-4250: activemq-spring should not be dependent on spring-test at runtime.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432401 13f79535-47bb-0310-9956-ffa450edef68
2013-01-12 09:09:20 +00:00
Timothy A. Bish 5b5bc45b17 fix for: https://issues.apache.org/jira/browse/AMQ-4238
ensure we clean up when the ManagementContext gets shut down. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432112 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 15:56:08 +00:00
Timothy A. Bish c0b39615d4 fix for failing test, the check for inactive durables was waiting exactly as long as the housekeeping thread's sleep interval which could cause it to sometimes miss the very last run of the housekeeper and falsely detect leftover inactive ones. Make the test wait for longer than the sleep interval and also provide a clean shutdown of the house-keeper thread.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431700 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 22:19:56 +00:00
Timothy A. Bish 86afe187c1 fix warnings
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431699 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 22:17:24 +00:00
Gary Tully 109cbe0993 https://issues.apache.org/jira/browse/AMQ-4248 - ensure iter is cleared when we are done, i.e. on call to release
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431660 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 21:27:47 +00:00
Gary Tully 7d2ac2d936 derby on virtual hw can be very slow, so a query with an intentionally large backlog can take some time
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431494 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 16:51:12 +00:00
Timothy A. Bish 6e36321669 https://issues.apache.org/jira/browse/AMQ-4163
Removed the journal component as its dependent on the now deprecated activemq-amq-store code.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431492 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 16:43:21 +00:00
Gary Tully 20d3bdb4eb https://issues.apache.org/jira/browse/AMQ-4157 - test case and fix. when an ack is in a tx we need to wait for the store sync as it may be a rollback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431463 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 16:11:40 +00:00