Commit Graph

115 Commits

Author SHA1 Message Date
Seth Leger 982f739e24 AMQ-6301: Changed activemq-osgi so that it embeds the spring-dm bundles
so that we can avoid loading the spring-dm feature which causes Spring
version conflicts.
2016-07-12 12:29:01 -04:00
Christopher L. Shannon (cshannon) 0ebc7a4da8 Revert "https://issues.apache.org/jira/browse/AMQ-6136"
This reverts commit 4ee29c363f.

We need to remove the dependency on Spring DM before doing this

(cherry picked from commit 7eb25ec50b)
2016-01-29 14:58:31 +00:00
Christopher L. Shannon (cshannon) 957fb85786 https://issues.apache.org/jira/browse/AMQ-6136
Switching the version for Spring in features-core.xml to allow Spring
4.x versions.

(cherry picked from commit 4ee29c363f)
2016-01-21 16:11:07 +00:00
Dejan Bosanac b8698953f3 https://issues.apache.org/jira/browse/AMQ-5744 - jasypt-spring31 2015-04-24 11:56:26 +02:00
Jeff Genender 6d6ed4eaaf AMQ-5721 - Update ActiveMQ to use commons-pool2 instead of commons-pool.AMQ-5636 will need it. The JMS pool and other components should use it as well. 2015-04-16 16:01:39 +02:00
Dejan Bosanac 01d0155149 https://issues.apache.org/jira/browse/AMQ-5558 - enable producer/consumer commands in karaf 2015-02-11 12:42:46 +01:00
Dejan Bosanac 35683c1c1c Upgrade dependencies 2015-02-11 11:40:37 +01:00
gtully 3a6d67e8f9 https://issues.apache.org/jira/browse/AMQ-4727 - use OsgiBundleXmlApplicationContext from service factory so that an embedded camel route can find a required bundlecontext 2015-01-26 15:39:04 +00:00
gtully 25f18ad20d https://issues.apache.org/jira/browse/AMQ-5526 - tidy up karaf-itest, features amqp now work,still issue with camel and bundlecontext null 2015-01-21 15:10:09 +00:00
gtully 548aa1e415 https://issues.apache.org/jira/browse/AMQ-5525 - worked around the issue with blueprint converter - all. All of the activemq commands have the same single arg signature, so the conversion should be trivial, doing the conversion inline in the default case 2015-01-20 11:47:01 +00:00
Dejan Bosanac fb684db4a8 https://issues.apache.org/jira/browse/AMQ-5121 - use jmxLocal in karaf only for jmx-based commands 2014-09-18 15:25:22 +02:00
gtully 66a689df0e fix up karaf-itests , related commits https://issues.apache.org/jira/browse/AMQ-5224 https://issues.apache.org/jira/browse/AMQ-5105 Update poms to fully load into M2E - 06bb7a2716 2014-07-28 15:30:12 +01:00
Dejan Bosanac a4682fcb47 https://issues.apache.org/jira/browse/AMQ-5176 - use scala 2.11 in karaf 2014-06-03 13:23:39 +02:00
Jonathan Anstey b807f28c5d Update jasypt bundle version 2014-02-06 17:09:13 -03:30
Jonathan Anstey c4e56f1f58 Update velocity version to match Camel 2014-02-06 16:59:46 -03:30
Dejan Bosanac e64da4a71f https://issues.apache.org/jira/browse/AMQ-4909 - add jms credenitals for the console 2013-12-11 17:21:09 +01:00
Dejan Bosanac 26c41d0362 https://issues.apache.org/jira/browse/AMQ-4909 2013-12-11 16:43:34 +01:00
Jean-Baptiste Onofré 6258ce1761 [AMQ-4931] Use auto-export="interfaces" in the Karaf commands service definition 2013-12-11 14:03:02 +01:00
Claus Ibsen 927be0ce7a AMQ-4903: AMQ Karaf should depend to http feature instead of jetty to support both Karaf 2.x and 3.x. Thanks to Jean for the patch. 2013-11-27 11:28:33 +01:00
Dejan Bosanac 85fc686006 https://issues.apache.org/jira/browse/AMQ-4844 - introduce activemq core karaf features 2013-11-04 15:08:17 +01:00
Hiram Chirino 52f418d6c9 Switch bat to the latest version of zookeeper, we can fix it's OSGi metadata using a wrap URL handler. 2013-10-11 09:38:31 -04:00
gtully 5bdcc19693 simplify default config, remove vmcursor refs and default memory limits to 70% heap. hardcoded default 1g 2013-10-10 13:53:39 +01:00
Claus Ibsen 211f566b54 AMQ-4795: amqp transport doesnt work yet in osgi. 2013-10-10 14:28:20 +02:00
Claus Ibsen 0e5ff6b485 AMQ-4795: Enable amqp transport out of the box in activemq-karaf 2013-10-10 13:59:49 +02:00
Claus Ibsen a503172675 Fixed activemq karaf commands. 2013-10-01 22:37:04 +02:00
Claus Ibsen ee8b51b27b AMQ-4760: Added dstat command to activemq karaf commands. 2013-10-01 16:23:48 +02:00
gtully b66559ee07 https://issues.apache.org/jira/browse/AMQ-4757 activemq-jms-pool a generic jms xa pool derived from activemq-pool which activemq-pool now extends with amq specifics 2013-09-30 23:09:25 +01:00
Dejan Bosanac 0203cde150 https://issues.apache.org/jira/browse/AMQ-4702 - added additional bundlel jaxb impl 2013-09-05 14:41:10 +02:00
Jonathan Anstey 3d6065ea3f AMQ-4702 - Error resolving org.jvnet.jaxb2_commons packages 2013-09-04 15:51:42 -02:30
Claus Ibsen bb7c33124b Upgraded to Karaf 2.3.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1502430 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 05:54:00 +00:00
Bosanac Dejan 06dae40d94 https://issues.apache.org/jira/browse/AMQ-4593 - upgrade snappy java
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1495392 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 11:31:23 +00:00
Bosanac Dejan afe2e3ca08 fix some osgi regressions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1494934 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 11:29:43 +00:00
Claus Ibsen 6a83487086 AMQ-4552: activemq feature to install in karaf. Still some problems.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1485655 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 11:54:10 +00:00
Gary Tully b65fd27109 https://issues.apache.org/jira/browse/AMQ-4432 - itest with mods to support, spring.handlers is now aware of camel handler
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1463909 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 10:36:37 +00:00
Gary Tully 719f5e8946 allow obr client dependency to resolve spring for blueprint pid factory in osgi-inf - https://issues.apache.org/jira/browse/AMQ-4341
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1463526 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 13:25:42 +00:00
Bosanac Dejan e80dc81741 https://issues.apache.org/jira/browse/AMQ-4341 - fix activemq-osgi headers and dependencies; make javax.* non-optional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1458717 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 10:13:45 +00:00
Bosanac Dejan 4276091e21 https://issues.apache.org/jira/browse/AMQ-4377 - bring back activemq-blueprint module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1456991 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 15:42:36 +00:00
Gary Tully af5f38797d https://issues.apache.org/jira/browse/AMQ-4341 - some more tweaks and tests from the feedback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450824 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 16:02:28 +00:00
Gary Tully 30b20b3f38 https://issues.apache.org/jira/browse/AMQ-4341 - apply patch from ioannis with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450550 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 00:36:48 +00:00
Bosanac Dejan cfe9e151c0 https://issues.apache.org/jira/browse/AMQ-4317 - activemq-camel feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1446543 13f79535-47bb-0310-9956-ffa450edef68
2013-02-15 11:57:31 +00:00
Bosanac Dejan c9fcc006ed https://issues.apache.org/jira/browse/AMQ-4317 - activemq-camel feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1446245 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 15:41:49 +00:00
Gary Tully 8bb5894716 fix up missing license files - our rat check friend
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442998 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 14:59:30 +00:00
Bosanac Dejan 0d529af312 https://issues.apache.org/jira/browse/AMQ-4034 - web console osgi itest improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442162 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 16:12:21 +00:00
Bosanac Dejan 6028ec4d35 https://issues.apache.org/jira/browse/AMQ-4034 - osgi, add default configurations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441501 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 16:03:23 +00:00
Bosanac Dejan 081b823c2d https://issues.apache.org/jira/browse/AMQ-4034 - osgi, remove create-broker and destory-broker commands
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441470 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 14:53:32 +00:00
Gary Tully d84e8e1826 fix up client feature itest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441437 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 13:08:28 +00:00
Bosanac Dejan 0d27c49bbf https://issues.apache.org/jira/browse/AMQ-4034 - osgi web console, laying down foundations for config admin configuration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441064 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 16:59:49 +00:00
Bosanac Dejan dc3eb911fa https://issues.apache.org/jira/browse/AMQ-4034 - osgi web console, fixing classpath
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441059 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 16:52:01 +00:00
Bosanac Dejan b1a7e75099 https://issues.apache.org/jira/browse/AMQ-4034 - adding activemq-http feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440444 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 15:01:57 +00:00
Bosanac Dejan 94f1f27c35 https://issues.apache.org/jira/browse/AMQ-4034 - adding spring feature so we can be compatible with both karaf 2.x and 3.x
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440406 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 13:28:52 +00:00