Hiram Chirino [Thu, 29 Jan 2015 15:33:25 +0000 (10:33 -0500)]
[maven-release-plugin] prepare release apollo-project-1.7.1
Hiram Chirino [Thu, 29 Jan 2015 15:25:02 +0000 (10:25 -0500)]
don't try to automatically deploy the website on release.
Hiram Chirino [Thu, 29 Jan 2015 15:12:30 +0000 (10:12 -0500)]
[maven-release-plugin] prepare for next development iteration
Hiram Chirino [Thu, 29 Jan 2015 15:12:20 +0000 (10:12 -0500)]
[maven-release-plugin] prepare release apollo-project-1.7.1
Hiram Chirino [Thu, 29 Jan 2015 15:02:33 +0000 (10:02 -0500)]
Don't push change to the remote repo on release.
Hiram Chirino [Thu, 29 Jan 2015 14:36:38 +0000 (09:36 -0500)]
Update website links to point at next version.
Hiram Chirino [Thu, 29 Jan 2015 14:19:22 +0000 (09:19 -0500)]
[maven-release-plugin] prepare for next development iteration
Hiram Chirino [Thu, 29 Jan 2015 14:19:06 +0000 (09:19 -0500)]
[maven-release-plugin] prepare release apollo-project-apollo-project-1.7.1
Hiram Chirino [Thu, 29 Jan 2015 14:06:20 +0000 (09:06 -0500)]
Update the parent pom version.
Hiram Chirino [Thu, 29 Jan 2015 13:06:33 +0000 (08:06 -0500)]
Applying matthewkmayer's patch: A quick pass at fixing up some typos in the docs.
Dejan Bosanac [Tue, 26 Aug 2014 13:11:09 +0000 (15:11 +0200)]
https://issues.apache.org/jira/browse/APLO-366 - make xpath parser features configurable
Hiram Chirino [Thu, 8 May 2014 00:50:05 +0000 (20:50 -0400)]
Upgrade jaxb version so that the project builds against Java 8.
leiqin [Mon, 28 Apr 2014 08:29:26 +0000 (16:29 +0800)]
Fixed bug https://issues.apache.org/jira/browse/APLO-355
leiqin [Sun, 27 Apr 2014 10:32:26 +0000 (18:32 +0800)]
add a test cast to shows stomp websocket utf-8 handing failing
Hiram Chirino [Tue, 25 Feb 2014 01:22:37 +0000 (20:22 -0500)]
[maven-release-plugin] prepare for next development iteration
Hiram Chirino [Tue, 25 Feb 2014 00:18:46 +0000 (19:18 -0500)]
[maven-release-plugin] prepare release apollo-project-1.7
Hiram Chirino [Tue, 25 Feb 2014 00:10:15 +0000 (19:10 -0500)]
Fixes compile error.
Hiram Chirino [Mon, 24 Feb 2014 23:59:06 +0000 (18:59 -0500)]
Pickup new releases of dependencies.
Hiram Chirino [Mon, 24 Feb 2014 23:54:00 +0000 (18:54 -0500)]
Add support for getting the intended host name from the WireFormatInfo in openwire.
Hiram Chirino [Mon, 24 Feb 2014 23:53:33 +0000 (18:53 -0500)]
More work improving the openwire generator.
Hiram Chirino [Mon, 24 Feb 2014 14:45:46 +0000 (09:45 -0500)]
Support configuring the package names in the openwire generator standalone app.
Christian Posta [Mon, 24 Feb 2014 18:44:11 +0000 (11:44 -0700)]
tidy up some things for the 1.7 release including license, notice, and website version
Hiram Chirino [Fri, 21 Feb 2014 16:58:45 +0000 (11:58 -0500)]
Support customizing the package names generated by the openwire generator so that the plugin can be re-used by other projects that need to generate openwire codecs.
Hiram Chirino [Thu, 20 Feb 2014 15:57:00 +0000 (10:57 -0500)]
[maven-release-plugin] prepare for next development iteration
Hiram Chirino [Thu, 20 Feb 2014 15:56:52 +0000 (10:56 -0500)]
[maven-release-plugin] prepare release apollo-project-1.7
Hiram Chirino [Thu, 20 Feb 2014 15:47:33 +0000 (10:47 -0500)]
Update the scm info.
Hiram Chirino [Thu, 20 Feb 2014 15:18:52 +0000 (10:18 -0500)]
Upgrade to latest qpid client version.
Hiram Chirino [Thu, 20 Feb 2014 15:06:24 +0000 (10:06 -0500)]
Preping for a release.
Hiram Chirino [Thu, 20 Feb 2014 14:56:01 +0000 (09:56 -0500)]
Upgrade to hawtdispatch 1.20 to fix APLO-339: java.nio.channels.CancelledKeyException
Hiram Chirino [Thu, 20 Feb 2014 14:47:57 +0000 (09:47 -0500)]
Allow MQTT 3.1.1 clients to connect.
Hiram Chirino [Wed, 5 Feb 2014 16:05:00 +0000 (11:05 -0500)]
Fixes APLO-303: AssertionError: Use of object not allowed after it has been released.
Hiram Chirino [Mon, 3 Feb 2014 16:18:55 +0000 (11:18 -0500)]
Implements APLO-213: Support an option to set the JMSXUserID openwire header based on the authenticated user.
Hiram Chirino [Mon, 3 Feb 2014 15:34:47 +0000 (10:34 -0500)]
Have the cli scripts continue to support --version and --help options.
Hiram Chirino [Mon, 3 Feb 2014 15:24:50 +0000 (10:24 -0500)]
Fixes APLO-349: Empty STOMP Header Name is Allowed
Hiram Chirino [Mon, 3 Feb 2014 14:11:07 +0000 (09:11 -0500)]
Lets add the new airline ASL dependency in the NOTICE file.
Hiram Chirino [Sat, 1 Feb 2014 19:02:15 +0000 (14:02 -0500)]
Might fix APLO-347: Action not Authorized Errors when viewing admin interface over HTTPS.
Disable auto complete for the login form.
Hiram Chirino [Sat, 1 Feb 2014 18:26:34 +0000 (13:26 -0500)]
Implements APLO-348: Decouple cli argument parsing from the Karaf version used using Airline to parse the args
Hiram Chirino [Fri, 31 Jan 2014 17:01:05 +0000 (12:01 -0500)]
Switch to snapshot build of hawtdispatch for fix related to APLO-339
Hiram Chirino [Fri, 31 Jan 2014 16:16:36 +0000 (11:16 -0500)]
Lets simplify things related to APLO-324
Hiram Chirino [Fri, 31 Jan 2014 16:13:43 +0000 (11:13 -0500)]
Fix some bugs that were generating error messages in the tests.
Hiram Chirino [Fri, 31 Jan 2014 16:06:40 +0000 (11:06 -0500)]
Fix for APLO-312: Apollo fails to bumb up the ulimit!
- We now do a binary search for the max allowed ulimit bump in case the default is too high.
Hiram Chirino [Fri, 31 Jan 2014 14:50:36 +0000 (09:50 -0500)]
Fixes APLO-308 - Filesystem permissions in released package are broken.
We now explicitly configure the directory and file modes in the assembly.
Hiram Chirino [Thu, 30 Jan 2014 23:50:22 +0000 (18:50 -0500)]
Implements APLO-301: Add a "ttl" header to control message expiration
Hiram Chirino [Thu, 30 Jan 2014 21:18:28 +0000 (16:18 -0500)]
To aid in trouble shooting errors liek APLO-317, lets add -XX:+HeapDumpOnOutOfMemoryError to the default JVM options.
Hiram Chirino [Thu, 30 Jan 2014 21:13:03 +0000 (16:13 -0500)]
Fixes APLO-324: ConcurrentModificationException in recent snapshot
Hiram Chirino [Thu, 30 Jan 2014 20:58:02 +0000 (15:58 -0500)]
Fixes APLO-332: Apollo not starting with cygwin under windows7
The Apollo unix distro now does the right thing when run in cygwin.
Hiram Chirino [Thu, 30 Jan 2014 20:23:37 +0000 (15:23 -0500)]
The apollo-broker-service.exe needs to move to the broker.jar since thats' the module that extracts it.
Hiram Chirino [Thu, 30 Jan 2014 20:22:39 +0000 (15:22 -0500)]
Default to a random mqtt client ID so the example works better OOTB
Hiram Chirino [Thu, 30 Jan 2014 18:20:45 +0000 (13:20 -0500)]
Fixes APLO-342: Memory leaks when using openwire with transactions
Hiram Chirino [Thu, 30 Jan 2014 17:12:29 +0000 (12:12 -0500)]
Fixes APLO-338: PeriodStat buffer in Broker grows infinitely
Credit goes to Magnus Holm who identified the cause.
Hiram Chirino [Fri, 24 Jan 2014 14:55:20 +0000 (09:55 -0500)]
Update dependency versions.
Hiram Chirino [Fri, 24 Jan 2014 14:41:15 +0000 (09:41 -0500)]
Fixes APLO-346: Debug log doesn't log a deleting queue
Hiram Chirino [Fri, 24 Jan 2014 14:36:21 +0000 (09:36 -0500)]
Fixes APLO-337 : Dead link on landing page to ActiveMQ
Hiram Chirino [Thu, 17 Oct 2013 13:29:06 +0000 (09:29 -0400)]
Update the leveldbjni version to the lastest release.
Hiram Chirino [Fri, 11 Oct 2013 19:09:30 +0000 (15:09 -0400)]
Update dependency versions.
Christian Posta [Wed, 14 Aug 2013 18:08:17 +0000 (18:08 +0000)]
updated test for https://issues.apache.org/jira/browse/APLO-335
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1513995
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Tue, 13 Aug 2013 18:23:13 +0000 (18:23 +0000)]
Added test for cleanSession=false and subscribing to wildcard dest
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1513607
13f79535-47bb-0310-9956-
ffa450edef68
Bosanac Dejan [Tue, 6 Aug 2013 15:54:07 +0000 (15:54 +0000)]
make apollo-selector an osgi bundle, as it's used in external projects (like stompjms)
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1511012
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Fri, 2 Aug 2013 19:08:17 +0000 (19:08 +0000)]
fixed tests that inherited from OpenwireParallelTest after I added DLQ tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1509817
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 31 Jul 2013 15:31:51 +0000 (15:31 +0000)]
Change the any protocol so that it swaps out the codec and handler when the AnyProtocolHandler receives the ProtocolDetected command.
Also the any protocol does not pass the new codec down the the next protocol handler anymore so don't try to handle that case anymore.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508929
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 31 Jul 2013 15:31:33 +0000 (15:31 +0000)]
If an invalid protocol name is configured on a connector generate a more descriptive error message indicating the error.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508928
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 31 Jul 2013 15:31:26 +0000 (15:31 +0000)]
Expose an async_die method on the ProtocolHandler interface.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508927
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 31 Jul 2013 15:31:06 +0000 (15:31 +0000)]
Adding a method to broker to get the socket address for a specific connector id.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508926
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 31 Jul 2013 15:30:59 +0000 (15:30 +0000)]
Have the stomp protocol keep better track of in progress commits to aid in debugging.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508925
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 31 Jul 2013 15:30:51 +0000 (15:30 +0000)]
Pass the connector object to the createProtocolHandler method so that a protocol can use config details to control the creation the protocol handler instance.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508923
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Wed, 31 Jul 2013 15:07:20 +0000 (15:07 +0000)]
Added test for openwire DLQ handling w/ redelivery policy to answer question from mailing list
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508902
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Tue, 30 Jul 2013 22:30:07 +0000 (22:30 +0000)]
if there are transport failures, let's raise the level of logging so we see what they are
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508672
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Tue, 30 Jul 2013 21:11:03 +0000 (21:11 +0000)]
fix for https://issues.apache.org/jira/browse/APLO-332 - Apollo not starting with cygwin under windows7
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508628
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Tue, 30 Jul 2013 14:00:19 +0000 (14:00 +0000)]
added tests for APLO-325 for broker-side config of max_text_message_size
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508450
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Tue, 30 Jul 2013 13:59:56 +0000 (13:59 +0000)]
added log4j and keystore to the dir that IDERunner looks so running from IDE works a little better and can switch to ssl connectors easier
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508448
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Fri, 26 Jul 2013 09:57:23 +0000 (09:57 +0000)]
Fixing bug that can cause NPE.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1507245
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Thu, 25 Jul 2013 16:02:09 +0000 (16:02 +0000)]
add documentation for APLO-325
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1507037
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Thu, 25 Jul 2013 15:55:38 +0000 (15:55 +0000)]
add documentation for APLO-325
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1507032
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Thu, 25 Jul 2013 09:40:28 +0000 (09:40 +0000)]
More fixes for APLO-325: Applying Christian Posta's patch which allows making the WS message size configurable.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1506864
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Thu, 25 Jul 2013 09:20:53 +0000 (09:20 +0000)]
Test and partial fix for APLO-325: Modify the stomp.js client so that it limits how big a WS frame can be.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1506857
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Tue, 16 Jul 2013 15:23:35 +0000 (15:23 +0000)]
fixed CORS response headers for allowable methods: Access-Control-Allow-Methods
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1503755
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Mon, 15 Jul 2013 20:42:57 +0000 (20:42 +0000)]
updated the protocol-filter-factory to use ProtocolFilter3 and not the deprecrated 2.. the new SimpleProtocolFilter3Factory can deal with backward incompatibility issues
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1503466
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Sat, 13 Jul 2013 16:51:53 +0000 (16:51 +0000)]
Fixes APLO-330 : Support using a different Authorizer Authenticator implementations.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1502827
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Fri, 12 Jul 2013 14:12:36 +0000 (14:12 +0000)]
Fixing bug to allow adding custom broker services.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1502569
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Tue, 9 Jul 2013 15:35:54 +0000 (15:35 +0000)]
Fixes failing ws tests due to the websocket client moving.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1501337
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Tue, 9 Jul 2013 15:35:47 +0000 (15:35 +0000)]
Disable a failing test for now.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1501336
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Fri, 5 Jul 2013 22:02:15 +0000 (22:02 +0000)]
Add an MQTT websocket example. We now detect determine if we will be using binary transfers based on type of frame the client initially sends us.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1500150
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Fri, 5 Jul 2013 22:01:37 +0000 (22:01 +0000)]
Move the stomp websocket example under the stomp examples directory. Also include jquery so that the demo works without an internet connection.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1500149
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Mon, 24 Jun 2013 19:10:59 +0000 (19:10 +0000)]
If the instance config can't be generated avoid failing the webapp startup.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1496163
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Mon, 24 Jun 2013 05:26:14 +0000 (05:26 +0000)]
Fixed the package names I used, which otherwise broke XmlCodecTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1495926
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Mon, 24 Jun 2013 02:50:04 +0000 (02:50 +0000)]
previously committed wrong version of DtoModuleTest.. fixed it up now..
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1495907
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Mon, 24 Jun 2013 02:28:54 +0000 (02:28 +0000)]
fixed typo in creating key stores
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1495901
13f79535-47bb-0310-9956-
ffa450edef68
Christian Posta [Mon, 24 Jun 2013 02:28:28 +0000 (02:28 +0000)]
added simple tests for classloading dto moduels
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1495900
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Tue, 18 Jun 2013 15:51:39 +0000 (15:51 +0000)]
Reorganizing bits around so that an Apollo instance can be created and booted within a user webapp more easily.
- Broker instance creation logic is now inside the broker module. And supports a couple more options so that the created broker can work well when inside a webapp.
- The JMX mbean can now be configured with the advertised web admin url.
- The web module now deploy it's webapp resources and classes a distinct jars for easier embedding in .war files.
- Added an example war module that embeds apollo.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1494181
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Thu, 13 Jun 2013 18:53:49 +0000 (18:53 +0000)]
Tweaks needed to get the Apollo working nicer with hawtio
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1492820
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Thu, 13 Jun 2013 11:55:15 +0000 (11:55 +0000)]
Fixes: APLO-328 cors_origin configuration attribute of the the web connectors not properly setting the Access-Control-Allow-Headers
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1492632
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Mon, 3 Jun 2013 19:50:52 +0000 (19:50 +0000)]
Port a possible fix from ActiveMQ
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1489130
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Mon, 3 Jun 2013 19:50:32 +0000 (19:50 +0000)]
When a producer target disconnects and the producer was in the process of dispatching to him, make sure we ack the in process delivery so that the producer un-blocks.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1489129
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Thu, 30 May 2013 13:33:12 +0000 (13:33 +0000)]
Adding debugging details for the openwire protocol too.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1487858
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 29 May 2013 23:50:21 +0000 (23:50 +0000)]
Fix label in disk benchmark util.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1487684
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 29 May 2013 23:19:13 +0000 (23:19 +0000)]
Optimize the range ack case a bit when the first message is being acked. This should lower the CPU usage as we don't need to iterate all the messages sent to the consumer.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1487677
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 29 May 2013 23:19:04 +0000 (23:19 +0000)]
Upgrade selenium version and test against Safari too.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1487676
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 29 May 2013 23:18:53 +0000 (23:18 +0000)]
Update selenium version used.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1487675
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 29 May 2013 23:18:48 +0000 (23:18 +0000)]
Reduce the number of dispatch sources used by a queue.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1487674
13f79535-47bb-0310-9956-
ffa450edef68
Hiram R. Chirino [Wed, 29 May 2013 23:18:32 +0000 (23:18 +0000)]
Simplify test case.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1487673
13f79535-47bb-0310-9956-
ffa450edef68