Commit Graph

221 Commits

Author SHA1 Message Date
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
Bosanac Dejan 94f71ccf40 https://issues.apache.org/jira/browse/AMQ-4034 -first step on fixing features and creating a osgi service factory for the broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1435065 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 10:12:11 +00:00
Bosanac Dejan 1b27f95393 https://issues.apache.org/jira/browse/AMQ-4034 - fixing activemq-broker feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433970 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 15:05:53 +00:00
Claus Ibsen a0f785a758 AMQ-4252: OSGi JARs in activemq-spring is provided and optional.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433835 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 06:47:08 +00:00
Bosanac Dejan eff119471d https://issues.apache.org/jira/browse/AMQ-4034 - first stab at karaf integration tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433543 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 17:29:20 +00:00
Hiram R. Chirino 8eb11a3aa7 Added a activemq-osgi module which is an uber OSGi bundle of all the ActiveMQ jars to make integrating into OSGi a little simpler.
Adding karaf-itests module.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428537 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:37:45 +00:00
Hiram R. Chirino 8dbfbb0095 Make the activemq module just plain jars instead of bundles.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428536 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:37:20 +00:00
Hiram R. Chirino ecaae53fe8 Moved the remaining bits to the activemq-optional module to a trash dir that we won't build anymore. We can clean it out once we are sure we don't need anything from it.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407199 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 18:13:11 +00:00
Claus Ibsen 3bf111ed2c AMQ-4154: Fixed activemq to be installed as feature in Karf
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404908 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 10:19:29 +00:00
Claus Ibsen 332c27a7ce Upgraded velocity bundle to latest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404904 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 09:52:27 +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
Claus Ibsen cb1871ffca Fixed features.xml to use version number of project.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392783 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 08:09:57 +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
Gary Tully b469638171 fix up assembly xml configuration validtion tests - have them run by default. Pull out osgi isms to separate hook and add shutdown hook when jetty.xml is included so that it is shutdown on broker stop. Fix problems with the xml eposed by the tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390204 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 22:52:28 +00:00
Hiram R. Chirino 44bc59b5cc Replace the fusemq-leveldb /w activemq-leveldb module in the features.xml
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389897 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 14:56:57 +00:00
Timothy A. Bish e11f786b93 apply patch for: https://issues.apache.org/jira/browse/AMQ-3554
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387857 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 05:02:39 +00:00
Claus Ibsen 9a32e38627 AMQ-4056: Upgraded jmDNS to 3.4.1, and removed old obsolte activemq-jmdns module that is no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387052 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 08:44:42 +00:00
Claus Ibsen b358c05696 AMQ-4060: Upgraded Spring OXM to Spring 3 version.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1386583 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 12:38:51 +00:00
Claus Ibsen f653fbfe14 AMQ-4047: activemq-option feature included needed JARs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1386535 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 10:00:53 +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