Commit Graph

3630 Commits

Author SHA1 Message Date
Bosanac Dejan 68bcac109a https://issues.apache.org/jira/browse/AMQ-3237 - FileLock.tryLock() doesn't work well in all environments
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084533 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 10:43:21 +00:00
Bosanac Dejan 8d65328f0f https://issues.apache.org/jira/browse/AMQ-3105 - removing icu4j from activemq-core and some more fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084526 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 09:50:19 +00:00
Timothy A. Bish cad663a1e9 Update the test so that its not dependent on port 61617.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084379 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 22:23:14 +00:00
Gary Tully 32d24fbbdd https://issues.apache.org/jira/browse/AMQ-3003 - pass new sub parameter from expired processing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084188 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 14:11:03 +00:00
Gary Tully e10f75c33d https://issues.apache.org/jira/browse/AMQ-3236 - In the case of DLQ processing due to an exception from onMessage, provide the exception string as a message property. New property, org.apache.activemq.command.ActiveMQMessage#DLQ_DELIVERY_FAILURE_CAUSE_PROPERTY will hold the string form of the exception that causes a posion ack for a dlq message. It may be null if the cause was regular calls to rollback or message expiry. Wireformat change to have exception included with messageAck. new version 7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084175 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 13:46:16 +00:00
Gary Tully 27c1719757 https://issues.apache.org/jira/browse/AMQ-3003 - Allow the option of a DLQ per durable subscription DeadLetterStrategy. Additional attribute destinationPerDurableSubscriber, when true causes default dlq individual prefex to be prepended with the durab sub key, connectionid:subscriberName pair. Modified DeadLetterStrategy interface to pass in message and subscription, to provide fine level controll of dlq name. Also modified Broker interface to provide subscription to message expiry and sendToDLQ methods.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084023 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 23:41:44 +00:00
Gary Tully d618ab37b0 https://issues.apache.org/jira/browse/AMQ-3231 - have stompconnection use format instead of toString for marshalling such that toString can be used for logging; mask password and truncate content like text message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084020 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 23:34:32 +00:00
Timothy A. Bish 8314d8651f Clean up the test a bit and adds some additional time to account for slower machines.
Removes System.out and replaces with logging.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084009 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 22:50:02 +00:00
Timothy A. Bish 8fd00fac58 fix test breakages caused by the initial fix for: https://issues.apache.org/jira/browse/AMQ-3231
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083988 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 22:11:19 +00:00
Gary Tully e44ccf7f08 https://issues.apache.org/jira/browse/AMQ-3222 - fix test regression, xbean url parsing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083770 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 13:12:52 +00:00
Gary Tully 400990f98a https://issues.apache.org/jira/browse/AMQ-3231 - Stomp Frame should mask passcode header in toString output, so it does not pollute the log
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083753 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 12:21:37 +00:00
Gary Tully 3973d8ff22 fix typo in accessor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083752 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 12:20:11 +00:00
Bosanac Dejan 0de4f88aa7 https://issues.apache.org/jira/browse/AMQ-3218 - exclusive consumer with highest priority should always get through
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082939 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 14:53:44 +00:00
Bosanac Dejan cc810aa4da https://issues.apache.org/jira/browse/AMQ-3219 - adding missing MDCHelper class
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082530 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 15:15:27 +00:00
Bosanac Dejan 2b456ddbd0 https://issues.apache.org/jira/browse/AMQ-3219 - more work on MDC logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082489 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 13:53:38 +00:00
Gary Tully 986ed145a7 https://issues.apache.org/jira/browse/AMQ-3222 - Failover and SimpleDiscovery - query parameters getting dropped, resolve by leaving composite prams in place and seperating out params that need to be applied to discovered transports, new format 'discovered.x' for the mulitcast case. Revisit https://issues.apache.org/jira/browse/AMQ-2981,https://issues.apache.org/jira/browse/AMQ-2598,https://issues.apache.org/activemq/browse/AMQ-2939
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082333 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 22:48:26 +00:00
Bosanac Dejan 2a558c80a6 https://issues.apache.org/jira/browse/AMQ-3220 - network connectors and wildcards
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081810 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 15:08:50 +00:00
Bosanac Dejan 2900806b9e https://issues.apache.org/jira/browse/AMQ-3204 - adding additional null check
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081697 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 09:39:47 +00:00
Timothy A. Bish 3d61acf2b2 fix for: https://issues.apache.org/jira/browse/AMQ-3199
fix for: https://issues.apache.org/jira/browse/AMQ-3200

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081540 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:44:59 +00:00
Bosanac Dejan f0429be6ee https://issues.apache.org/jira/browse/AMQ-3219 - add basic support for MDC and enable broker name to appear in log entries
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081502 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 18:24:21 +00:00
Gary Tully 55b9954873 give debug logging insight to the inactivity monitor negotiation, output local and remote infos
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080560 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 12:58:19 +00:00
Gary Tully 286c9d0020 https://issues.apache.org/jira/browse/AMQ-3183 - fix typo in useAuthenticatedPrincipalForJMSXUserID
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080512 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 10:53:02 +00:00
Gary Tully 3df3302c65 https://issues.apache.org/jira/browse/AMQ-3211 - ensure that a JMSXUserID property set by a client is ignored if an alternative userId mechanism is in place. This ensures that a client cannot spoof this value when the broker is configured to supply if from credentials. The client supplied value is only used as a last resourt
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080212 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 13:24:34 +00:00
Gary Tully f93d05acef https://issues.apache.org/jira/browse/AMQ-3198 - unregister failed add connection but have unregister respect the reference count such that it is only removed if the refcount is 1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079885 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 17:01:55 +00:00
Timothy A. Bish 4f9784dafc apply patch for: https://issues.apache.org/jira/browse/AMQ-3209
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079831 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 15:17:59 +00:00
Bosanac Dejan 8700ab7cde https://issues.apache.org/jira/browse/AMQ-3198 - don't unregister original connection
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079782 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 13:06:43 +00:00
Gary Tully fe0a764836 give test plenty of time before failing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079757 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 11:43:29 +00:00
Bosanac Dejan 6c09e846b1 https://issues.apache.org/jira/browse/AMQ-2632 - dispose the old transport listener before rebalancing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079384 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 15:01:59 +00:00
Bosanac Dejan 373417c0df give FailoverClusterTest a bit more time to reconnect
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079324 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 11:16:11 +00:00
Timothy A. Bish 5b5d494e65 Fix and test for: https://issues.apache.org/jira/browse/AMQ-2213
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079004 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 22:49:17 +00:00
Timothy A. Bish 74a45502e2 Test for: https://issues.apache.org/jira/browse/AMQ-3199
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 15:55:08 +00:00
Gary Tully 1c1aa17311 https://issues.apache.org/jira/browse/AMQ-3206 - Unsubscribed durable sub can leave dangling message reference in kahaDB, visible after a restart
resolved by correctly updating the persitent index when a durable sub with an outstanding backlog is unsubscribed. Additional test that vaidates fix

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078799 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 14:58:26 +00:00
Bosanac Dejan 008b3e551c https://issues.apache.org/jira/browse/AMQ-3204 - support for non-standard destination path separator
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078766 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 13:02:58 +00:00
Timothy A. Bish d75bb6d6d8 fix for: https://issues.apache.org/jira/browse/AMQ-3202
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078312 13f79535-47bb-0310-9956-ffa450edef68
2011-03-05 17:15:25 +00:00
Timothy A. Bish f29c8011d0 Fix for: https://issues.apache.org/jira/browse/AMQ-3045
Adds an optional maximumRedeliveryDelay that defaults to -1 to indicate no max so behavior is unchanged from previous versions.  When the backoff multiplier is enabled and the maximumReliveryDelay is set > -1 then the delay returned by getNextReliveryDealy is capped by the max of either maximumReliveryDelay or redeliveryDelay preventing delays smaller than the configured redelivery delay.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078189 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 22:39:11 +00:00
Gary Tully 69f56058f2 https://issues.apache.org/jira/browse/AMQ-3198 - Allow JAAS GuestLoginModule to fail if users specify a password
new option to GuestLoginModule, credentialsInvalidate, when true, presence of a password will cause module to fail login
allowing the next module to validate the credential. Will only guest users who don't specify a password

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078048 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 16:48:01 +00:00
Gary Tully 78f85ed277 further reduction in stack traces at warn level in log for STOMP, suppress to stack trace to debug level, better for authorized broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077889 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:46:39 +00:00
Gary Tully 1b45e3be04 https://issues.apache.org/jira/browse/AMQ-3193 - fix regression with spring listener test. IndirectMessageRef cannot do equals bc it will break composite destination delivery to a single consumer, possible to break inflight count as ack of one message removes others from dispatched when message ref matches in error.
Fix is to ensure message ref is passed about such that there is a single ref per message. rework some internals to pass ref rather than message.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077886 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:31:01 +00:00
Bosanac Dejan d17ecebec4 https://issues.apache.org/jira/browse/AMQ-3197 - virtual destinations and wildcards
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076651 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 15:24:32 +00:00
Gary Tully 93e2bd355b https://issues.apache.org/jira/browse/AMQ-3196 - Speed up initial message delivery for offline durable sub with keepDurableSubsActive=true and JDBC store
avoid stop/start of cursor when keepdurablesubsactive=true such that a valid message count is retained by the cursor, independent of the store. This avoids unnecessary calls to the underlyin gtore on activation and reactivation

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076278 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 16:23:40 +00:00
Bosanac Dejan 330c9a896d https://issues.apache.org/jira/browse/AMQ-2981 - Connecting to broker using discovery protocol fails
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076192 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 12:32:26 +00:00
Gary Tully d8fd5330a4 https://issues.apache.org/jira/browse/AMQ-3193 - implement equals for indirect message ref, so remove from pendingdispatch will work on moveMessages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075864 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 15:59:59 +00:00
Gary Tully 462efdb9de https://issues.apache.org/jira/browse/AMQ-3193 - rework of fix to always populate pagedInPending
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075846 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 15:26:00 +00:00
Bosanac Dejan 645037e539 fix for FailoverTransportBrokerTest failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 13:44:31 +00:00
Bosanac Dejan 1d885d393e https://issues.apache.org/jira/browse/AMQ-2981 - modified test with workaround
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075820 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 13:43:55 +00:00
Gary Tully f38908eb52 https://issues.apache.org/jira/browse/AMQ-3195 - NetworkConnector initialization should be backed by an executor
added new broker attribute networkConnectorStartAsync (default false) that will cause network connectors
to be started in seperate threads such that a block of one does not effect the rest

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075801 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 12:59:09 +00:00
Bosanac Dejan 5ad72d650c https://issues.apache.org/jira/browse/AMQ-2981 - test case for discory uri with params
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075407 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 16:19:26 +00:00
Bosanac Dejan 99653c6c8c https://issues.apache.org/jira/browse/AMQ-3193 - consumers don't get messages after JMX remove
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075346 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 14:23:30 +00:00
Timothy A. Bish 72a0fd1a43 fix for: https://issues.apache.org/jira/browse/AMQ-2256
suppress the stack trace output for the error and just log a warning that the URI path is not valid for binding to a local port.  Output the full exception stack trace if debug logging is turned on.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074948 13f79535-47bb-0310-9956-ffa450edef68
2011-02-26 22:52:39 +00:00
Timothy A. Bish 56f8e368d5 fix for: https://issues.apache.org/jira/browse/AMQ-2929
Added test showing how a Text Message that was compressed can be received in a state where the text is not compressed but the Message compressed flag indicates it is resulting in an exception from getText() indicating an unknown compression type.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074725 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 22:33:19 +00:00
Gary Tully 57f5e7efa5 https://issues.apache.org/jira/browse/AMQ-3192 - Add setTrustStore() and setKeyStore() methods to ActiveMQSslConnectionFactory class
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074577 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 15:25:21 +00:00
Gary Tully 7739a3cc4a suppress stack trace from failed add connecton to debug level trace, such that the warn just has the exception toString, with an authenticated broker, the stack trace is too much information and is the predominant reason for a failure to add
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074550 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 14:54:48 +00:00
Gary Tully 2d121f4092 https://issues.apache.org/jira/browse/AMQ-3190 - Durable Subscription - missing messages when selector matching sub resumes after broker restart
the next message id needs to be tracked such that unmatched messages are not ignored from the indexi after a restart. Tracking it as part of message add
in the ackPositions.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074511 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 13:17:14 +00:00
Timothy A. Bish a5fc6dd999 Add fix for https://issues.apache.org/jira/browse/AMQ-3153 and add user supplied unit test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074289 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:00:26 +00:00
Timothy A. Bish 6595dc4a62 Apply patch for https://issues.apache.org/jira/browse/AMQ-3185
Confirmed the current code allows for two calls to stop before the disposed flag is triggered.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074209 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 16:51:59 +00:00
Bosanac Dejan 0c98cb0818 fixing broker configurations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074094 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 10:13:33 +00:00
Bosanac Dejan d884ba2964 test topic replication in full mesh network scenario
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074060 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 07:58:22 +00:00
Gary Tully 0298440d4f JDBC relative test too slow for hudson, disable this variant
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1073680 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 10:33:41 +00:00
Gary Tully 3419bb7ca5 ensure test uses clean slate as previous priority tests can leave additional rows in the db
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1073671 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 10:08:44 +00:00
Gary Tully cb967831d6 https://issues.apache.org/jira/browse/AMQ-3188 - Full table scan for durable subs in jdbc store when priority enabled; very slow with large message backlog
added more state to the topic message store such that it can ask the db for a single priority at a time which is indexed. This avoids a full table scan.
send rate with active durable subs vs inactive durable subs is now in the region of 6x from 40x. validation test included.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1073453 13f79535-47bb-0310-9956-ffa450edef68
2011-02-22 18:51:54 +00:00
Gary Tully 8649f65c54 see what goes on with the listener when org.apache.activemq.transport.failover.FailoverTransportBrokerTest#testNoBrokersInBrokerInfo fails
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071939 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 10:26:15 +00:00
Gary Tully 6d444d5132 don't use MEM store for transaction recovery tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071737 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 18:27:54 +00:00
Gary Tully a6c51a4532 https://issues.apache.org/jira/browse/AMQ-2736 - KahaDB doesn't clean up old files (abortive shutdown)
After kill -9 with outstanding local transaction the transaction is recovered in error. fix and test

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071732 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 18:04:54 +00:00
Timothy A. Bish 14722f8627 fix for: https://issues.apache.org/jira/browse/AMQ-3006
assign default JMS priority when none is set on a Message.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071432 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 22:54:23 +00:00
Timothy A. Bish e0c678e9a0 Apply patch for: https://issues.apache.org/jira/browse/AMQ-3036
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071411 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 21:38:41 +00:00
Gary Tully e8d9b709e0 remove duplicate test and add auto fail, see if we can find why it hangs in hudson
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071323 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 17:42:19 +00:00
Gary Tully 6f68a94319 https://issues.apache.org/jira/browse/AMQ-3182 - JAAS PropertiesLoginModule does not maintain internal validity state, so will commit in error after an invalid login attempt
https://issues.apache.org/jira/browse/AMQ-3183 - Set JMSXUserID value based on authenticated principal
Fixed up PropertiesLoginModule such that it maintains login state and only commits on success. Added attribute brokerService useAuthenticatedPrincipalForJMXUserID to indicate
that the first authenticated user principal should be used for the userName and hense by the userId broker when populateJMSXUserID is set. In the absense of a principal the
userName is unchanged.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071301 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 16:12:18 +00:00
Hiram R. Chirino b0c2a40fb9 Removing svn keywords, they don't have much value and just add additional noise when diffing source trees.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071259 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 14:08:48 +00:00
Hiram R. Chirino 0bbc0acb84 Removing svn keywords, they don't have much value and just add additional noise when diffing source trees.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071256 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 13:58:54 +00:00
Timothy A. Bish 8280417876 fix for: https://issues.apache.org/jira/browse/AMQ-3000
Scheduler wasn't taking into account that there might be a job that was scheduled earlier than the last wait time for jobs when they are fired.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071109 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 23:46:43 +00:00
Hiram R. Chirino 65f2428342 Fixes AMQ-3181
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070876 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 13:02:59 +00:00
Gary Tully 6b643dc2c3 https://issues.apache.org/jira/browse/AMQ-3120 - KahaDB error: "Could not locate data file"
Test failure, issue with over eager cleanup. journal write as part of cleanup was incrementing the last update location
leaving the current journal file as a candidate for cleanup prematurely. This could ocurr between a destination store journal
write and index update so that the file was not present in the inexe. Capturing the last update exclusive of the checkpoint
write resolves this

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070484 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 13:17:38 +00:00
Gary Tully a1d3245182 https://issues.apache.org/jira/browse/AMQ-3180 - ensure correct type us used in error case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070443 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 11:15:42 +00:00
Gary Tully 9edeb21bec https://issues.apache.org/jira/browse/AMQ-3180 - JMX Browse of BytesMessage fails with javax.management.openmbean.OpenDataException: Argument's element itemValues[8]=[B@de15a0 is not a valid value for this item. readonly flag needs to be flipped by browser such that content can be read.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070442 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 11:11:01 +00:00
Gary Tully bf4dd7330d http://issues.apache.org/jira/browse/AMQ-3178 - 5.3.x clients to 5.4 brokers always get updated cluster information in the broker info, this should be configurable
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069846 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 15:42:38 +00:00
Gary Tully cfdd68c799 https://issues.apache.org/jira/browse/AMQ-3167 - add test case from Arthur with thanks.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069813 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 14:29:33 +00:00
Gary Tully 8fdf3457e3 resolve regression of some ra transaction tests, follow on from http://svn.apache.org/viewvc?view=revision&revision=1065688 - a shared context needs to be aware that ended transactions that are unresolved are considered active. browse needs to only commit for local transactions when ending
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069796 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 13:48:33 +00:00
Gary Tully 971f61f0d3 remove dependency on jmx 1099 port
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069783 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 12:42:15 +00:00
Gary Tully 237f83578f give bridge formation more time after a restart
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069781 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 12:38:13 +00:00
Gary Tully 784ead59c7 test that seems to show missing durable messages after restat, needs investigation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069758 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 11:35:29 +00:00
Bosanac Dejan 8bf987b134 https://issues.apache.org/jira/browse/AMQ-3177 - use slf4j instead of jcl
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069405 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 14:24:01 +00:00
Gary Tully a204c793b2 wait for complete formation of network before verification, some more time for slower machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069352 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 12:11:17 +00:00
Gary Tully 7f002de964 remove dependency on jmx 1099 port
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069347 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 12:02:09 +00:00
Gary Tully 55ae21c381 remove dependency on jmx 1099 port
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069344 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 11:56:31 +00:00
Gary Tully 27d0ff4011 https://issues.apache.org/jira/browse/AMQ-3176 - Potential deadlock in duplex network connector recreation, resulting in dangling connections. https://issues.apache.org/jira/browse/AMQ-3129 - Can only have one duplex networkConnection per transportConnection. Rework of https://issues.apache.org/jira/browse/AMQ-2774. NetworkConnector.name attribute (default NC) is used to differenciate duplex network connectors so it needs to be unique to allow multiple to be configured. Removing existing matching network connectors on a reconnect is now thread safe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069339 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 11:02:48 +00:00
Timothy A. Bish 3d82d74862 Apply fix and test for: https://issues.apache.org/jira/browse/AMQ-3141
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1068952 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 16:05:24 +00:00
Timothy A. Bish 595e44c64c Adding test and fix for https://issues.apache.org/jira/browse/AMQ-3140 using included patch with modifications.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1068935 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 15:23:38 +00:00
Bosanac Dejan ab412fa136 some virtual destination with wildcard consumers tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1068336 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 11:24:59 +00:00
Gary Tully eae88fe309 test that shows issues with backlog for durable subs
across three stores

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1067187 13f79535-47bb-0310-9956-ffa450edef68
2011-02-04 14:57:26 +00:00
Bosanac Dejan 1a177f374a adding test for virtual destinations in networks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1066402 13f79535-47bb-0310-9956-ffa450edef68
2011-02-02 10:26:06 +00:00
Gary Tully aae3ea27f7 resolve regression in JDBCXACommitExceptionTest from https://issues.apache.org/activemq/browse/AMQ-2880
Change http://svn.apache.org/viewvc?rev=1064858&view=rev demostrated need to separate jms transacted
session recovery from xa recovery.
Issue related to using XASession without transactions. https://issues.apache.org/jira/browse/AMQ-2659
fix makes XASession indicated it is transacted during commit processing so that a close does not precipiate
an auto ack. ended transactions, available till forget will keep transacted=true

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1065688 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 17:20:18 +00:00
Gary Tully 29c0dff26a it can take more than 30 seconds for network of 20 to get in line on a slower box, so incease the default delay
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1065591 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 13:11:27 +00:00
Gary Tully 31c01f8916 new xa test - jdbc and jms
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1064858 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28 20:20:06 +00:00
Gary Tully acc3d4f7cb https://issues.apache.org/jira/browse/AMQ-3167 - possible skipped Queue messages in memory limited configuration with fast consumers
resolve off by one error in messageOrderIndex setBatch

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1064660 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28 13:25:22 +00:00
Gary Tully aadd682d09 https://issues.apache.org/jira/browse/AMQ-3159 - Log file offset in addition to file location in checkpointUpdate()
patch applied with thanks.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1063712 13f79535-47bb-0310-9956-ffa450edef68
2011-01-26 13:39:27 +00:00
Gary Tully 62c6c8f8d8 https://issues.apache.org/jira/browse/AMQ-3161 - Race condition in ActiveMQ Journal Checkpoint worker thread cleanup leads to multiple running instances
patch applied with thanks, one small mod, left un synced check in store(..) such that locking only occurs if thread needs a restart

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1063710 13f79535-47bb-0310-9956-ffa450edef68
2011-01-26 13:30:42 +00:00
Gary Tully 62609f099a https://issues.apache.org/jira/browse/AMQ-3162 - ActiveMQ checkpoint worker makes unnecessary repeated calls to Journal.getFileMap(), leading to excessive memory usage
applied variation of the patch with thanks. Now make one call to find the current set of referenced files.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1063669 13f79535-47bb-0310-9956-ffa450edef68
2011-01-26 10:40:35 +00:00
Gary Tully ed6a4c7067 https://issues.apache.org/jira/browse/AMQ-3038 - fix unit test regression, a temp dest may have a null conneciton if it was added from an advisory
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1063248 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 12:15:50 +00:00
Bosanac Dejan cb9f176752 https://issues.apache.org/jira/browse/AMQ-3143 - additional commit for storeUsage limit change
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1063214 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 10:39:11 +00:00
Gary Tully 610c5bf4d8 https://issues.apache.org/jira/browse/AMQ-3148 - LoggingBrokerPlugin addConnection(..) log output is meaningless
patch applied with thanks.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1062756 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 12:40:26 +00:00