Commit Graph

152 Commits

Author SHA1 Message Date
Hiram R. Chirino bc7aa98d45 trunk has moved onto 4.1 development.. if you want to work on 4.0.1 stuff, co the 4.0 branch!
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@411906 13f79535-47bb-0310-9956-ffa450edef68
2006-06-05 20:16:30 +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
Guillaume Nodet 0b88dbe3e7 Now the distribution fully works on m2 (without tests).
However, we need to rework all the scope of dependencies (mainly for activemq-core)

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@394772 13f79535-47bb-0310-9956-ffa450edef68
2006-04-17 20:38:21 +00:00
Guillaume Nodet bfa4b9bb68 Fix m2 build: the distribution is nearly identical to the m1 dist.
Remaining problems: missing STATUS file, and activemq.rar is way too big

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@394399 13f79535-47bb-0310-9956-ffa450edef68
2006-04-15 23:33:05 +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
Frederick G. Oconer b8b2258fc7 Fix for maven 2 builds and organized the dependencies.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389950 13f79535-47bb-0310-9956-ffa450edef68
2006-03-30 01:12:00 +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
Hiram R. Chirino f451ad04bf - Switched the m2 builds to use maven-one-plugin so that the activeio jars can be used in the maven 1 build activemq is using.
- the m2 build now uses the same groupId that our m1 activemq build is using.  I know it's not the m2 way to name groups, we I'm willing to live with this until we are out of the incubator and using m2 to do builds by default.
- Ported activemq to use activeio 3.0-SNAPSHOT from activeio 2.1, since the 3.x stuff is in a new package space, it should not conflict with previous version (for example the version used in Geronimo).



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388677 13f79535-47bb-0310-9956-ffa450edef68
2006-03-24 23:41:23 +00:00
Hiram R. Chirino e94ba16710 Updated m2 build to use latest geronimo spec jars
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387924 13f79535-47bb-0310-9956-ffa450edef68
2006-03-22 19:52:39 +00:00
Hiram R. Chirino 14763b4f20 Reved up to the latest version of the geronimo spec jars
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387873 13f79535-47bb-0310-9956-ffa450edef68
2006-03-22 15:27:50 +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
Adrian T. Co f471303cc5 - Modified the version of the mx4j dependency to use the predefined one.
- Excluded HttpsTransportBrokerTest.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385695 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 23:15:53 +00:00
Hiram R. Chirino 7fc12716f5 disabled test so the m2 build succeeds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385131 13f79535-47bb-0310-9956-ffa450edef68
2006-03-11 18:46:24 +00:00
Hiram R. Chirino c40f989966 Refactored the .NET client so that all the JMS references are NMS. Figured Sun would not be happy if we called this JMS.
also tweeked the m2 poms a little




git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384452 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 07:11:37 +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 bea3be6e01 Applyed http://jira.activemq.org/jira/browse/AMQ-582
Thanks Carlos!  This should help our m2 build a ton.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@378696 13f79535-47bb-0310-9956-ffa450edef68
2006-02-18 06:03:51 +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
Alan Cabrera 85402ce387 Clean up
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@370004 13f79535-47bb-0310-9956-ffa450edef68
2006-01-18 01:54:51 +00:00
Hiram R. Chirino a0adce9cb5 Updated poms so that we use the incubator-apache group id so that folks can clearly tell that we are still in the incubator
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@369097 13f79535-47bb-0310-9956-ffa450edef68
2006-01-14 21:27:28 +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 d15e8dff27 don't include jmdns in the rar
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365916 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 14:42:13 +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 2457c42d7e More m2 build tweeks, brought in the activemq-optional module.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358476 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 03:43:57 +00:00
Jonas B. Lim b195cc7985 added missing dependencies on rar file (spring and xbean-spring jars)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358436 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 02:01:23 +00:00
Hiram R. Chirino bd66398a29 Applied patch at https://jira.logicblaze.com/jira/browse/AMQ-442
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358392 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 21:43:55 +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
James Strachan df06a63bcf Applied Bills patch for m2 build
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358009 13f79535-47bb-0310-9956-ffa450edef68
2005-12-20 14:51:04 +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