Commit Graph

5168 Commits

Author SHA1 Message Date
Gary Tully 41506505f4 https://issues.apache.org/jira/browse/AMQ-1780 - ActiveMQ broker does not automatically reconnect if the connection to the database is lost - extend the DefaultIOExceptionHandler http://activemq.apache.org/configurable-ioexception-handling.html to be aware of sql exceptions and provide a connector stop/resume option. This is now called in the event of a failure to get a jdbc connection, the default behaviour is to stop as before, but new iptions to ignore some sql exceptions or to stop/resume connectors are supported which allow a db restart to be recovered without restarting the broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086182 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 11:00:06 +00:00
Timothy A. Bish 53f789b475 fix for: https://issues.apache.org/jira/browse/AMQ-3241
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085773 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 17:24:27 +00:00
Timothy A. Bish bbd4b33646 On really slow machine this test can take a bit longer than the current timeout.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085539 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 19:48:32 +00:00
Bosanac Dejan 8e3e5839e9 change camel to version 2.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085377 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 14:02:45 +00:00
Gary Tully d4d3915d91 help diagnose jenkins failure with expired messages advisory error, tidy up logging to include exception
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085337 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 11:52:49 +00:00
Timothy A. Bish 08bd791c5d On a slow machine this test can take a lot longer, so increase the wait time accordingly.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085119 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 20:31:26 +00:00
Timothy A. Bish 751ba900ae fix for: https://issues.apache.org/jira/browse/AMQ-2171
Need to send a pull command when prefetch is zero, also adds test case for this issue.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085080 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 19:15:50 +00:00
Bosanac Dejan 2f414913e1 https://issues.apache.org/jira/browse/AMQ-3207 - Various improvements to features.xml possible with karaf-2.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084938 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 12:54:17 +00:00
Bosanac Dejan d68ef66f7b https://issues.apache.org/jira/browse/AMQ-3142 - use 5.4.2 activemq-karaf for 2.1.x compatibility
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084933 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 12:35:50 +00:00
Gary Tully 228abac0c1 remove hard dependency on free ports
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084902 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 11:29:26 +00:00
Gary Tully f23303ae66 add auto fail to ensure it won't block a hudson build again and we get a thread dump
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084900 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 11:22:49 +00:00
Gary Tully 4298a41af8 give it more time to produce for hudson
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084892 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 10:39:51 +00:00
Timothy A. Bish 883eed0e38 Update the tests so that they're not dependent on port 61616
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084797 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 22:58:18 +00:00
Timothy A. Bish 5cf486c975 Update the test so that its not dependant on port 61616
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084751 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 21:24:46 +00:00
Bosanac Dejan 0bb98ba038 https://issues.apache.org/jira/browse/AMQ-3142 - attempt to make it work with both 2.1.x and 2.2.x karaf
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084635 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 16:50:34 +00:00
Gary Tully c42d8de034 https://issues.apache.org/jira/browse/AMQ-2852 - Memory leak when undeploying webapp with ActiveMQ client - AMQ store piece
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084633 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 16:36:55 +00:00
Bosanac Dejan 4552896e91 https://issues.apache.org/jira/browse/AMQ-2968 - make it work nicely in osgi
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084613 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 15:19:18 +00:00
Gary Tully eee1db625a https://issues.apache.org/jira/browse/AMQ-3236 - revert use of all caps in property name
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084604 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 14:42:59 +00:00
Bosanac Dejan 3da9f1c6ea https://issues.apache.org/jira/browse/AMQ-3219 - add prefix to mdc keys
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084576 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 13:17:09 +00:00
Gary Tully 6f5b224ef4 see if the pool shutdown later helps
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084573 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 13:13:14 +00:00
Gary Tully 88c10842df https://issues.apache.org/jira/browse/AMQ-3238 - Topic-Messages not redelivered to durable subscription after rollback and reconnect. resolve by making durable sub ack transaction aware, issue existed across all stores
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084550 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 11:50:50 +00:00
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
Bosanac Dejan 2305b7e7af https://issues.apache.org/jira/browse/AMQ-3105 - removing icu4j from activemq-console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084520 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 09:29:55 +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
Bosanac Dejan 41424a41b9 remove activemq-rar from the distro and add a notice
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084249 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 16:51:50 +00:00
Bosanac Dejan a065bb1fb3 https://issues.apache.org/jira/browse/AMQ-3105 - removing icu4j as we're now requiring JDK 6
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084237 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 16:20:51 +00:00
Bosanac Dejan 536755170c https://issues.apache.org/jira/browse/AMQ-3235 - use old web console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084208 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 15:00:56 +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
Bosanac Dejan 8ba02a395f https://issues.apache.org/jira/browse/AMQ-3235 - upgrade to camel 2.8-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084132 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 11:09:52 +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
Timothy A. Bish 4ed4956306 Add .classpath to svn-ignore.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081796 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 14:13:10 +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