Commit Graph

214 Commits

Author SHA1 Message Date
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
Christopher L. Shannon (cshannon) f44c3d20ed https://issues.apache.org/jira/browse/AMQ-5356
Upgraded to Jetty 9.2.x to solve JDK 8 compatibility issues.
This required migrating to the new WebSocket API.
2015-09-03 11:54:57 +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
Christian Schneider 97b0619b26 [AMQ-5858] add import package 2015-06-23 16:14:31 +02:00
Jean-Baptiste Onofré 471911466b [AMQ-5770] Remove javax.servlet.resources package import allowing web console to work with Karaf 2.4.x, 3.x, and 4.x 2015-06-17 11:13:48 +02:00
Daniel Kulp cad1a2a8cd Open up the xbean osgi import range to include 4.x 2015-03-04 12:43:44 -05: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
Daniel Kulp 2128d4d246 Fix some itests due to the servlet import range being inadequate for the version of karaf we are testing with 2015-01-13 13:29:52 -05:00
Daniel Kulp d4aff4da64 Update to import stuff needed to run in karaf 2.4+ 2015-01-13 12:54:08 -05:00
Daniel Kulp 3f82625077 [AMQ-5517] Runtime support for Jetty 9. Build/compile with Jetty8, but tests pass with Jetty 9 for runtime level support. 2015-01-13 12:47:53 -05:00
gtully 60f9b020cc https://issues.apache.org/jira/browse/AMQ-5515 - update to 8.1.15.v20140411 2015-01-13 12:06:54 +00:00
gtully cf62d58ae7 https://issues.apache.org/jira/browse/AMQ-5515 - tidy up jetty deps - fix jetty maven coords 2015-01-12 22:58:07 +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
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
Daniel Kulp 06bb7a2716 Update poms to fully load into M2E 2014-07-10 13:47:55 -04: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
Krzysztof Sobkowiak 25600944e6 AMQ-5167 ActiveMQ web-cosole fails to start in Karaf - missing import 2014-06-05 11:33:24 +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
artnaseef f88043eaf7 AMQ-5028: merge update from dkulp: strip unused dependencies to reduce the size of the WAR file. 2014-02-06 18:28:26 -07:00
Daniel Kulp 17d1489c62 [AMQ-5029] embedded webconsole broker does not resolve activemq.data system property 2014-02-05 16:08:26 -05:00
Daniel Kulp f222741fdc More updates for removing sitemesh, remove activemq-all. 2014-02-03 15:13:44 -05: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
Claus Ibsen 4b0073da02 AMQ-4343: activemq-web-console can't be installed on Karaf 2.2.x. Thanks to Ioannis Canellos for the patch. 2013-09-24 09:21:29 +02:00
Bosanac Dejan 805d88af24 don't limit the web console on jetty 7; it should be able to run on newer versions as well
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1509629 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 11:17:38 +00:00
Claus Ibsen 629c24ba65 Align osgi version to 4.3.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1485657 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 12:01:53 +00:00
Hiram R. Chirino dc86b87236 Avoid building/packing legacy/deprecated modules.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445631 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 14:44:56 +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
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
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
Timothy A. Bish 3dd24195e6 removing dependencies on activemq-core
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431109 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 21:50:59 +00:00
Gary Tully 51785b1472 https://issues.apache.org/jira/browse/AMQ-4186 - fix up duplicate contenty type declaration, fix up pom so main in web-console works ok with current dependencies
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1412825 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 11:07:57 +00:00
Bosanac Dejan 0b0ed9f84d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392979 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:37:31 +00:00
Bosanac Dejan e396468d9b [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:37:00 +00:00
Bosanac Dejan 16dc729163 [maven-release-plugin] rollback the release of activemq-parent-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392968 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:24:44 +00:00
Bosanac Dejan c479df0679 [maven-release-plugin] prepare release activemq-parent-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392966 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:20:57 +00:00
Bosanac Dejan c83b70c3cd [maven-release-plugin] rollback the release of activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392935 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:44:05 +00:00
Bosanac Dejan f2af2c9187 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392933 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:40:11 +00:00
Bosanac Dejan 07bed31f7b [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392929 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:34:36 +00:00
Bosanac Dejan 798437773a rolling back version because of failed release:perform
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392924 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:22:49 +00:00
Bosanac Dejan 5094609ec5 [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392921 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:16:05 +00:00
Bosanac Dejan 3576fbe97a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392876 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 12:09:24 +00:00
Bosanac Dejan 02b2ba294e [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392874 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 12:08:45 +00:00
Bosanac Dejan a8d364d030 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392269 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 10:39:07 +00:00
Bosanac Dejan a97f821869 [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392267 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 10:38:35 +00:00
Claus Ibsen 11e6f88ded Polished
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387909 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 08:45:34 +00:00
Claus Ibsen eedb091f83 AMQ-3727: Added osgi import. Thanks to Thomas Themel for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387900 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 08:07:00 +00:00
Timothy A. Bish dd8899e173 Polish: don't need to specify versions of the plugins that are managed by our parent pom.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1384713 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 10:18:34 +00:00
Bosanac Dejan 87e300add0 https://issues.apache.org/jira/browse/AMQ-3923 - webconsole in osgi - get back jstl in war
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1361179 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 12:18:48 +00:00
Bosanac Dejan 1cd533078a https://issues.apache.org/jira/browse/AMQ-3923 - webconsole in osgi don't load css on a first page load
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1361132 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 09:56:29 +00:00
Bosanac Dejan 1b28cf1792 https://issues.apache.org/jira/browse/AMQ-3853 - activemq-web-console osgi import
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1341810 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 09:42:39 +00:00
Bosanac Dejan c587918821 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1332983 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 10:36:17 +00:00
Bosanac Dejan b7e264f917 [maven-release-plugin] prepare release activemq-5.6.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1332981 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 10:35:43 +00:00
Bosanac Dejan 710dc7bb20 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1329823 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 16:17:53 +00:00
Bosanac Dejan 96a9fb2502 [maven-release-plugin] prepare release activemq-5.6.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1329821 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 16:17:16 +00:00
Bosanac Dejan 401f768414 include eclipse jdt to make activemq-web-console jetty:run work again
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1307487 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 15:49:31 +00:00
Gary Tully f5b69f8783 https://issues.apache.org/jira/browse/AMQ-2570 - remove wildcards as they are ignored by bnd when the classes are not referenced and replace with explicit imports for the dependencies that are needed. In case of servlet, wildcard is ok as it is referenced but the spo bits of the logging package are needed for the appenders
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1300106 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 12:51:25 +00:00
Gary Tully 84a50910a6 https://issues.apache.org/jira/browse/AMQ-2570 - remove wildcards as they are ignored by bnd when the classes are not referenced. this fixes logging at the default debug level for pax logging when unbound from the war file
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1298620 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 22:22:17 +00:00
Gary Tully 14c1766843 https://issues.apache.org/jira/browse/AMQ-3743 - activemq-web-console WAR with SNAPSHOT dependencies breaks osgi Bundle-ClassPath in manifest. Make use of the war plugin outputFileNameMapping to ensure the timestamp is dropped to match the bundle-classpath
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1294359 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:14:54 +00:00
Bosanac Dejan 70997eeaf9 https://issues.apache.org/jira/browse/AMQ-3427 - compile with jdk7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1152720 13f79535-47bb-0310-9956-ffa450edef68
2011-08-01 09:53:47 +00:00
Gary Tully 442232514c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086321 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 18:02:03 +00:00
Gary Tully c94de4230a [maven-release-plugin] prepare release activemq-5.5.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086315 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 17:52:07 +00:00
Bosanac Dejan 81c5b9d6d3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039294 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:01:45 +00:00
Bosanac Dejan 2781601db1 [maven-release-plugin] prepare release activemq-5.4.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039292 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:01:35 +00:00
Bosanac Dejan 7fd8cc03d3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039020 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 12:32:08 +00:00
Bosanac Dejan 97a2838007 [maven-release-plugin] prepare release activemq-5.4.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039018 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 12:32:01 +00:00
Bosanac Dejan 90fb6e6e0f https://issues.apache.org/activemq/browse/AMQ-2989 - xmpp3
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1024215 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 12:18:20 +00:00
Hadrian Zbarcea 4802804da3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998393 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 02:24:50 +00:00
Hadrian Zbarcea 037b306ca6 [maven-release-plugin] prepare release activemq-5.4.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998391 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 02:24:21 +00:00
Hadrian Zbarcea d2380c8e8a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985386 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 22:14:13 +00:00
Hadrian Zbarcea a440b6c677 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985384 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 22:13:50 +00:00
Bosanac Dejan d3bb57d0bc [maven-release-plugin] rollback the release of activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985250 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 15:41:21 +00:00
Bosanac Dejan 760f56875a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985239 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 15:25:21 +00:00
Bosanac Dejan d3fc97aba2 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985237 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 15:24:34 +00:00
Bosanac Dejan d649a9184b rollbacking the previous RC
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985222 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 14:54:03 +00:00
Hadrian Zbarcea 0fad136cc6 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984126 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 17:07:29 +00:00
Hadrian Zbarcea 30d7a7d7d3 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984124 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 17:06:59 +00:00
Hadrian Zbarcea ac652da52d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983897 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 09:02:54 +00:00
Hadrian Zbarcea 3f8cb55122 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983895 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 09:02:36 +00:00
Hadrian Zbarcea 45116abe3a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983854 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 02:16:19 +00:00
Hadrian Zbarcea 3796cf4497 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983852 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 02:15:55 +00:00
Guillaume Nodet aac39acbb2 AMQ-2570: make sure the log is delegated to the framework if possible when the web console is deployed in osgi
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961717 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 11:24:10 +00:00
Bosanac Dejan e0f1872e69 https://issues.apache.org/activemq/browse/AMQ-2570 - karaf feature improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961622 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 08:17:05 +00:00
Bosanac Dejan 06b41bb759 https://issues.apache.org/activemq/browse/AMQ-2570 - more web console pom improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961470 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 18:30:14 +00:00
Bosanac Dejan 52a91db740 https://issues.apache.org/activemq/browse/AMQ-2570 - more web console pom improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961381 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 14:07:43 +00:00