Commit Graph

251 Commits

Author SHA1 Message Date
Christian Schneider f56ac06ef6 [AMQ-6584] Fix feature to make it work for karaf 4.1.0 2017-01-30 10:29:04 +01:00
Krzysztof Sobkowiak 6534a83c40 [AMQ-6576] Problem while installing activemq-camel with Camel 2.17.x or 2.18.x 2017-01-24 00:57:03 +01:00
gtully 59bfffd2b4 Revert "[AMQ-6515] Adding javax.inject bundle to fix the issue on feature install"
guava 14 was the culprit - activemq-osgi does not need to import javax.inject

This reverts commit 00129837de.
2016-12-02 12:55:20 +00:00
Benjamin Graf 89c1a7b8ba AMQ-5344: Replace bundles with feature 2016-11-25 09:16:28 +01:00
Christian Schneider 00129837de [AMQ-6515] Adding javax.inject bundle to fix the issue on feature install 2016-11-22 12:09:23 +01:00
Timothy Bish c239bf01a9 https://issues.apache.org/jira/browse/AMQ-6493
Ensure the proper versions of dependencies for Qpid JMS are brought in
for the test.
2016-11-01 15:19:05 -04:00
Krzysztof Sobkowiak 132840b09f https://issues.apache.org/jira/browse/AMQ-6442
Config file org.apache.activemq.server-default.cfg points config to ${karaf.base}/etc
2016-09-27 07:57:33 -04:00
Christopher L. Shannon (cshannon) 06a21dbbb3 [maven-release-plugin] prepare for next development iteration 2016-08-02 09:03:37 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
Christian Schneider 5a6d1550fb [AMQ-6380] Bundle to create pooled ConnectionFactories from configs in OSGi 2016-08-01 13:56:04 -04:00
Seth Leger 927bef7345 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:17:14 -04:00
Hiram Chirino 7fd5fa9253 Add a method that Karaf can use to get the description of the command. Depends on a change in karaf too to get this to work. 2016-05-05 09:26:33 -04:00
Andrea Cosentino 98c866817d AMQ-6181 - Upgrade to Joda-time 2.9 2016-02-23 15:47:52 +01:00
Christopher L. Shannon (cshannon) 7eb25ec50b 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
2016-01-29 14:57:11 +00:00
Christopher L. Shannon (cshannon) 4ee29c363f https://issues.apache.org/jira/browse/AMQ-6136
Switching the version for Spring in features-core.xml to allow Spring
4.x versions.
2016-01-21 16:09:30 +00:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05:00
Christopher L. Shannon (cshannon) cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon) abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
Chad Zobrisky f92c23a64e Updated jodatime to 2.8.2 2015-10-13 15:02:21 +00:00
Timothy Bish 94b56977d2 https://issues.apache.org/jira/browse/AMQ-5957
update the xstream bundle version.
2015-09-29 10:08:23 -04:00
Christopher L. Shannon (cshannon) 0f492f3b4b https://issues.apache.org/jira/browse/AMQ-5356
Migrated to Karaf 4.  This was required to support Jetty 9.2.x.
Fixed all OSGi unit tests.
2015-09-03 12:42:22 +00:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04: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 ae595c95b1 [maven-release-plugin] prepare for next development iteration 2015-01-30 12:46:19 +00:00
gtully 4ba1a1689f [maven-release-plugin] prepare release activemq-5.11.0 2015-01-30 12:46:08 +00:00
gtully bf5a2997c7 [maven-release-plugin] prepare for next development iteration 2015-01-26 16:48:46 +00:00
gtully eec2955bde [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:48:37 +00:00
gtully 64fa706d54 Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit f47fbe4b89.
2015-01-26 16:39:35 +00:00
gtully f47fbe4b89 [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:17:43 +00: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
Hadrian Zbarcea aedcae139b Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit 48b0cf396c.
2015-01-05 12:25:58 -05:00
Hadrian Zbarcea 89995f4723 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 7b285c6f52.
2015-01-05 12:25:47 -05:00
Dejan Bosanac 7b285c6f52 [maven-release-plugin] prepare for next development iteration 2014-12-29 12:44:32 +01:00
Dejan Bosanac 48b0cf396c [maven-release-plugin] prepare release activemq-5.11.0 2014-12-29 12:44:20 +01: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 fa086396a7 [maven-release-plugin] prepare for next development iteration 2014-06-05 11:59:29 +02:00
Dejan Bosanac 58dd93e42e [maven-release-plugin] prepare release activemq-5.10.0 2014-06-05 11:59:17 +02:00
Dejan Bosanac c2cf78542f [maven-release-plugin] prepare for next development iteration 2014-06-04 11:33:17 +02:00
Dejan Bosanac 5bc741f227 [maven-release-plugin] prepare release activemq-5.10.0 2014-06-04 11:33:03 +02: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 c1cedb5c34 AMQ-5060 - Upgrade to xstream 1.4.7 2014-02-18 13:15:19 -03:30
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
Dejan Bosanac fe36820b86 https://issues.apache.org/jira/browse/AMQ-4926 - karaf version range 2013-12-10 11:20:58 +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
gtully 864aa6798f [maven-release-plugin] prepare for next development iteration 2013-10-14 23:38:35 +01:00
gtully 87c9bbebac [maven-release-plugin] prepare release activemq-5.9.0 2013-10-14 23:38:22 +01:00
gtully ee0933c71e [maven-release-plugin] prepare for next development iteration 2013-10-11 14:51:36 +01:00
gtully b276006911 [maven-release-plugin] prepare release activemq-5.9.0 2013-10-11 14:51:24 +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 56174e770d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443026 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:45:26 +00:00
Gary Tully 5e257808f3 [maven-release-plugin] prepare release activemq-5.8.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443024 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:43:41 +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
Bosanac Dejan 70e2715d91 https://issues.apache.org/jira/browse/AMQ-4034 - removing activemq-extra feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439986 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 16:31:56 +00:00
Bosanac Dejan 1108323613 https://issues.apache.org/jira/browse/AMQ-4034 - cleaning up features a bit
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439935 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 15:28:20 +00:00
Timothy A. Bish ef24cc9a04 fix https://issues.apache.org/jira/browse/AMQ-4280
activemq-core module renamed to activemq-unit-tests

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439685 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 23:09:54 +00:00
Timothy A. Bish a55aae00e7 Scrub the pom files and remove old cruft and leftovers from the recent refactoring
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439680 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 22:44:25 +00:00
Bosanac Dejan 2e622a4e15 https://issues.apache.org/jira/browse/AMQ-4034 - initial work on leveldb integration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439086 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 14:03:41 +00:00
Bosanac Dejan 77c0cf9206 https://issues.apache.org/jira/browse/AMQ-4034 - copy all neccessary resources to activemq-osgi bundle
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437368 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 12:37:13 +00:00
Bosanac Dejan 33c564259c https://issues.apache.org/jira/browse/AMQ-4034 - moving service factory to activemq-osgi module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436831 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 10:39:23 +00:00
Bosanac Dejan fd46439e7e https://issues.apache.org/jira/browse/AMQ-4034 - adding logging and proper shutdown on destroy
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436827 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 10:07:36 +00:00