Commit Graph

128 Commits

Author SHA1 Message Date
Gary Tully 3266019825 resolve broker unit test testReceiveTwoThenCloseConnection(org.apache.activemq.ra.JmsXAQueueTransactionTest): ra test uses Auto ack mode but the xa tx has been cleaned up so amq just sees a close on auto ack so it delivers the ack. AMQ-2128 Keeping the tx around till after the close sorts this out. One question though, with the ack mode supposed to be ignored, does it makes sense for the RA to use a transacted ack mode when there is a transaction?
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@748258 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 18:19:58 +00:00
Gary Tully ca80106573 resolve unit test break, check for tx need to be overridden to take care of shared case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741646 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 17:28:13 +00:00
Guillaume Nodet 1ab76f775d AMQ-2091: Add a cache to the jms selector parser for speed improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@740375 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 19:05:07 +00:00
Gary Tully 40465998ee resolve issue with broken ra tests, allow XA operation on non transacted session, check for transaction now is xa aware
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739961 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 11:14:05 +00:00
Gary Tully 02ca463bf8 disable a bunch of ra xa tests pending some investigation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739001 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 20:44:21 +00:00
David Jencks ab438f68c1 AMQ-2079 improve error messages in AMQConnection.createSession, and make ManagedConnectionProxy only supply consistent parameters
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@735914 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 02:13:31 +00:00
David Jencks 1f00a395f8 AMQ-2078 extend transaction tests to xa in ra
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@735912 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 02:06:37 +00:00
David Jencks 185711e2f5 minor javadoc and spelling fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729437 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 20:17:29 +00:00
Gary Tully 50a98e3b0e fix - AMQ-2034 - have close in XA transaction deferred to synchronisation after completion, have rollback call beforeEnd to propagate acknowledgements; add a bunch of tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@726764 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 18:48:51 +00:00
Gary Tully c96cdf04d2 resolve broken test resulting from AMQ-1919
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707582 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 08:48:41 +00:00
Robert Davies 6db9a37d2f Fix for https://issues.apache.org/activemq/browse/AMQ-1777
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@666887 13f79535-47bb-0310-9956-ffa450edef68
2008-06-11 23:13:59 +00:00
Robert Davies 58e5b9acce patch for https://issues.apache.org/activemq/browse/AMQ-1779
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@664082 13f79535-47bb-0310-9956-ffa450edef68
2008-06-06 18:59:11 +00:00
Robert Davies 21568866ad Fix for https://issues.apache.org/activemq/browse/AMQ-1756
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@663052 13f79535-47bb-0310-9956-ffa450edef68
2008-06-04 10:36:06 +00:00
Hiram R. Chirino aa62069349 Fix for AMQ-1696
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@652111 13f79535-47bb-0310-9956-ffa450edef68
2008-04-29 20:59:06 +00:00
Robert Davies 464402cd0e Applied patch from https://issues.apache.org/activemq/browse/AMQ-1200
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@650392 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 07:09:52 +00:00
Robert Davies 8733d172ae Apply patch for https://issues.apache.org/activemq/browse/AMQ-765
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@648727 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 15:47:24 +00:00
Robert Davies acf453b46a Applied patch from https://issues.apache.org/activemq/browse/AMQ-1345
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@646789 13f79535-47bb-0310-9956-ffa450edef68
2008-04-10 13:16:37 +00:00
Hiram R. Chirino af27811a75 Merged in the rest of djencks's release changes from the 4.1 branch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@645991 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 16:28:08 +00:00
David Jencks 8d28bbfdab AMQ-1618 Refine thread safety of pool access operations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@637218 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 19:23:55 +00:00
Robert Davies bbd2e47dbd tidied up synchronization
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@637028 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 09:53:39 +00:00
David Jencks c57bad8711 AMQ-1618 Fix check for 'endpoint factory won't let us create any endpoints at all'
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@637004 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 06:36:49 +00:00
Robert Davies 91a0542315 Fix for https://issues.apache.org/activemq/browse/AMQ-1506
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628711 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 13:00:44 +00:00
Hiram R. Chirino 43d58b57b7 Fix for http://issues.apache.org/activemq/browse/AMQ-1519
Start up the embeded broker in an async thread so that it does not block the AppServer startup if a slave broker is started.


git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@609016 13f79535-47bb-0310-9956-ffa450edef68
2008-01-04 21:38:44 +00:00
Hiram R. Chirino 00895cecc1 ActiveMQ is out of the incubator.. no need for DISCLAIMER.txt anymore
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577759 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 14:13:23 +00:00
James Strachan aa87faaaac rolled back the previously applied patch for MessageActivationSpec and re-created the interface from scratch by pulling up all the public getters/methods from the original ActiveMQActivationSpec class to ensure we have the correct license headers etc
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@565398 13f79535-47bb-0310-9956-ffa450edef68
2007-08-13 16:24:29 +00:00
Hiram R. Chirino 540dd5c987 Last set of checkstyle violation fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@565003 13f79535-47bb-0310-9956-ffa450edef68
2007-08-12 05:27:21 +00:00
Hiram R. Chirino 5f1adbe898 More checkstyle fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564977 13f79535-47bb-0310-9956-ffa450edef68
2007-08-11 21:29:21 +00:00
Hiram R. Chirino ecf89a60bf More checkstyle violation fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564679 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 16:57:01 +00:00
Robert Davies 2256ec03b4 apply patch http://issues.apache.org/activemq/browse/AMQ-1293
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@550472 13f79535-47bb-0310-9956-ffa450edef68
2007-06-25 12:40:25 +00:00
James Strachan 3bd948f738 applied modified version of AMQ-1147 (keeping the implementation classes the same name to avoid issues with existing RA configurations)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@515576 13f79535-47bb-0310-9956-ffa450edef68
2007-03-07 14:14:23 +00:00
James Strachan d7355e7874 applied modified version of AMQ-1147 (keeping the implementation classes the same name to avoid issues with existing RA configurations)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@515574 13f79535-47bb-0310-9956-ffa450edef68
2007-03-07 14:10:33 +00:00
Hiram R. Chirino 86cbdfd5db Switching to Java 5.. Build and Runtime now require Java 5 see: http://www.nabble.com/Switching-to-ActiveMQ-4.2-to-Java-5----tf2637427.html
- Update maven build
- Removed dependency on concurrent-backport



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475999 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 00:29:03 +00:00
Hiram R. Chirino 9e6eb830b3 Set the eol-style
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474977 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 21:02:18 +00:00
Hiram R. Chirino 7a25bcf203 Adding NOTICE files to all build artifacts and updating some LICENCE files too.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467015 13f79535-47bb-0310-9956-ffa450edef68
2006-10-23 15:38:07 +00:00
Guillaume Nodet 29459ed414 Add missing xbean annotation on ActiveMQManagedConnectionFactory
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@466039 13f79535-47bb-0310-9956-ffa450edef68
2006-10-20 08:55:57 +00:00
James Strachan dcaf1dffb6 avoid serialization issues when using JNDI
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@448868 13f79535-47bb-0310-9956-ffa450edef68
2006-09-22 08:58:16 +00:00
Hiram R. Chirino 960dce70d3 http://issues.apache.org/activemq/browse/AMQ-888
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@433286 13f79535-47bb-0310-9956-ffa450edef68
2006-08-21 17:08:00 +00:00
Robert Davies d0da99a08c removed areas of contention (deadlocks)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@432224 13f79535-47bb-0310-9956-ffa450edef68
2006-08-17 13:07:24 +00:00
James Strachan 2b6f6371e0 fix for AMQ-856 - increase the logging level
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@429787 13f79535-47bb-0310-9956-ffa450edef68
2006-08-08 19:21:47 +00:00
Hiram R. Chirino 7f883f6fe2 Applied new source header boiler plate per http://www.apache.org/legal/src-headers.html
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@426384 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 05:00:24 +00:00
Hiram R. Chirino 96d92110a3 Applied new source header boiler plate per http://www.apache.org/legal/src-headers.html
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@426370 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 03:22:58 +00:00
Hiram R. Chirino 57b4941325 Applied new source header boiler plate per http://www.apache.org/legal/src-headers.html
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@426366 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 03:04:41 +00:00
James Strachan 3fcd7ca39c tidied up the xbean-spring configuration and used the xbean-spring maven plugin
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@421900 13f79535-47bb-0310-9956-ffa450edef68
2006-07-14 13:27:51 +00:00
James Strachan 3850704161 added a better error message if deployed on GlassFish and no connection manager is configured
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@415543 13f79535-47bb-0310-9956-ffa450edef68
2006-06-20 07:39:42 +00:00
James Strachan 9d0ca025fa fix for AMQ-689 to deal with NPE
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@408636 13f79535-47bb-0310-9956-ffa450edef68
2006-05-22 10:39:32 +00:00
Hiram R. Chirino 3fc0546936 Applied John Sission's patch: https://issues.apache.org/activemq/browse/AMQ-705 Thanks John!
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@399701 13f79535-47bb-0310-9956-ffa450edef68
2006-05-04 13:42:06 +00:00
Hiram R. Chirino 67064db832 Fix for problem reported by: Christopher G. Stach II
We're using Resin and trying to use 4.0-RC2.  It just so happens that
Resin makes this call in ConnectionPool.init(ManagedConnectionFactory):

ManagedConnection mConn = mcf.createManagedConnection(subject, null);

So, eventually that null info gets dereferenced and BOOM!

com.caucho.server.webapp.Application.start java.lang.NullPointerException
       at org.apache.activemq.ra.ActiveMQResourceAdapter.createConnectionFactory(ActiveMQResourceAdapter.java:156)
       at org.apache.activemq.ra.ActiveMQResourceAdapter.makeConnection(ActiveMQResourceAdapter.java:100)
       at org.apache.activemq.ra.ActiveMQManagedConnectionFactory.createManagedConnection(ActiveMQManagedConnectionFactory.java:103)
       at com.caucho.jca.ConnectionPool.init(ConnectionPool.java:462)

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@392556 13f79535-47bb-0310-9956-ffa450edef68
2006-04-08 16:48:15 +00:00
Hiram R. Chirino 97f2ca1eef fix for http://jira.activemq.org/jira/browse/AMQ-651
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@391694 13f79535-47bb-0310-9956-ffa450edef68
2006-04-05 18:12:05 +00:00
Hiram R. Chirino 3263205bf9 Add more useful info if broker fails to start and don't start an embedded broker by default.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389334 13f79535-47bb-0310-9956-ffa450edef68
2006-03-28 00:47:18 +00:00
James Strachan 27a677f459 added the ability to configure the redelivery policy on the activation spec
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386654 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 15:19:56 +00:00
James Strachan 242353b56c applied patch from Fabio Ospitia Trujillo
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384275 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 17:32:19 +00:00
James Strachan 149a9292c5 patch to ignore blank clientIds in a connectionRequestInfo
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383524 13f79535-47bb-0310-9956-ffa450edef68
2006-03-06 12:21:57 +00:00
Hiram R. Chirino 1882e545a5 fix testcase
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@382936 13f79535-47bb-0310-9956-ffa450edef68
2006-03-03 21:28:41 +00:00
Hiram R. Chirino 202b3efb96 http://jira.activemq.org/jira/browse/AMQ-612
http://jira.activemq.org/jira/browse/AMQ-613

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@382934 13f79535-47bb-0310-9956-ffa450edef68
2006-03-03 21:24:33 +00:00
James Strachan 4759540e6e fixed bug if the connection factory already has a clientId configured
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@382886 13f79535-47bb-0310-9956-ffa450edef68
2006-03-03 16:57:49 +00:00
James Strachan 32c7aeaf0e added comment to help diagnose deployment errors in JCA containers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@381971 13f79535-47bb-0310-9956-ffa450edef68
2006-03-01 09:57:12 +00:00
James Strachan c91724c35a change so that the connectionFactory property is always used if it is customized; if necessary, creating a copy and configuring it if the ConnectionRequestInfo has some configuration inside it
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@381762 13f79535-47bb-0310-9956-ffa450edef68
2006-02-28 19:49:15 +00:00
Hiram R. Chirino 4d00a1a311 did some more svn:eol-style property setting
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@379623 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 23:28:33 +00:00
Hiram R. Chirino 57406ceb78 Lets include these files in the rars too.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@378139 13f79535-47bb-0310-9956-ffa450edef68
2006-02-16 02:04:20 +00:00
Hiram R. Chirino 6d333ffb4a Just to be safe, lets also include the LICENSE.txt in the jar files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@378138 13f79535-47bb-0310-9956-ffa450edef68
2006-02-16 02:02:28 +00:00
Alan Cabrera 84942ae5b0 Added incubation disclaimer.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@377651 13f79535-47bb-0310-9956-ffa450edef68
2006-02-14 06:45:29 +00:00
Hiram R. Chirino 68d245f4bf Migrated to using xbean 2.2-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@376445 13f79535-47bb-0310-9956-ffa450edef68
2006-02-09 21:41:59 +00:00
Guillaume Nodet d1b05c4f23 Need to check if the server pool is closing before calling reconnect, as the method is synchronized and can cause deadlocks
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@374119 13f79535-47bb-0310-9956-ffa450edef68
2006-02-01 17:29:05 +00:00
Robert Davies d8bdbe7a7c Don't attempt to reconnect if serverSessionPool is closing
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@374118 13f79535-47bb-0310-9956-ffa450edef68
2006-02-01 17:21:47 +00:00
Frederick G. Oconer b2b1e80b86 Set to implement Serializable.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@372479 13f79535-47bb-0310-9956-ffa450edef68
2006-01-26 08:20:39 +00:00
Patrick Edward Lapus Villacorta a9852f8cb5 Changed <connection-impl-class> elements from JMSConnectionProxy (not in AMQ4) to ManagedConnectionProxy. Code for both is exactly the same.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@372386 13f79535-47bb-0310-9956-ffa450edef68
2006-01-26 01:03:19 +00:00
Hiram R. Chirino 32446c1f1d Fix for https://jira.logicblaze.com/jira/browse/AMQ-501
- ActiveMQManagedConnectionFactory now implements equals() and hashCode()
 - ActiveMQActivationSpec is now serializable.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@371951 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 16:20:42 +00:00
James Strachan cc1de0e202 fix for AMQ-348 to allow a ConnectionFactory to be specified so it can be shared across inbound and outputbound messaging
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366161 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 11:14:38 +00:00
James Strachan e310c21a8d applied patch from AMQ-356
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366156 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 10:55:13 +00:00
James Strachan f73e2097dd tidied up code a little
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366153 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 10:51:12 +00:00
James Strachan 205ac1188a allow customisation of the redelivery policy and prefetch policy on the ActiveMQ ResourceAdapter and ActiveMQManagedConnectionFactory and fix AMQ-467
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366152 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 10:44:52 +00:00
Hiram R. Chirino 5be5a62df6 Updated/Added more apache copyright headers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360181 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 22:37:11 +00:00
Hiram R. Chirino 48b4869472 Updated copyright headers to be (c) 2005-2006
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359679 13f79535-47bb-0310-9956-ffa450edef68
2005-12-29 02:15:21 +00:00
Hiram R. Chirino fd4bb60c2d refactoring package name from org.activemq to org.apache.activemq
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359585 13f79535-47bb-0310-9956-ffa450edef68
2005-12-28 18:39:37 +00:00
Jonas B. Lim 92a698fe42 updated headers in source file to use apache header
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358513 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 06:11:40 +00:00
Hiram R. Chirino b58da3b1be Implemented a toString() method
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358375 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 20:48:17 +00:00
Hiram R. Chirino 9b1345bb32 - Updated the config xml to use new discovery syntax.
- Using specific version of activeio as that may change a bit soon.
- The vm transport now support specifing a broker config file: vm://localhost?brokerConfig=xbean:/path/to/config/file
- Starting the JMX connector was taking a LONG time to start up... so I switch to starting it up async.
- The object name for a managed transport connection could be invalid so we now encode the name so that it's not.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356616 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 21:02:04 +00:00
James Strachan 40a7d3b6ac Moved the trunk code into the trunk sub directory
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356304 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 17:53:59 +00:00