Commit Graph

764 Commits

Author SHA1 Message Date
Martyn Taylor 95c4fdd408 ARTEMIS-762 Reflect management changes in AMQP protocol 2016-10-07 10:38:01 -04:00
Clebert Suconic ec48f9ed00 ARTEMIS-765 Improve Checkstyle 2016-09-30 11:12:09 -04:00
Andy Taylor bd9b2057fa ARTEMIS-758 - List/Object message sent by OpenWire JMS client can't be consumed with other clients
https://issues.apache.org/jira/browse/ARTEMIS-758
2016-09-29 20:28:31 -04:00
Clebert Suconic 01503ed46e ARTEMIS-739 fixing checkstyle 2016-09-29 12:58:20 -04:00
jbertram a6974596a0 ARTEMIS-739 fix large msg file leak on copy 2016-09-28 14:20:07 -04:00
Clebert Suconic a838bf0479 ARTEMIS-751 Simplification of the AMQP implementation
Since we don't need client implementations any longer, given the maturity level of
qpid jms, these classes can go, as a result a lot of the interfaces can be removed.

As part of this I am removing proton-plug, and reorganizing the packages in a way I think it
makes more sense and easier to other developers to understand and maintain it.

https://issues.apache.org/jira/browse/ARTEMIS-751
2016-09-27 09:29:40 -04:00
Clebert Suconic 4e349693f4 Fixing build on extra-tests 2016-09-27 09:21:25 -04:00
Ville Skyttä 447d7840aa Add missing @Overrides 2016-09-27 14:36:54 +03:00
jbertram 2dcf8de0de ARTEMIS-741 fix subscription queue leak on STOMP 2016-09-26 18:01:30 -04:00
Ville Skyttä b69af66f47 Expose disk-scan-period, max-disk-usage, and global-max-size in server control 2016-09-26 13:33:23 -04:00
jbertram ea552a1f88 ARTEMIS-747 multiple CDATA events on import fails 2016-09-23 12:15:13 -04:00
Ville Skyttä e98da5f288 Make bunch of private fields final 2016-09-23 09:06:08 -04:00
Andy Taylor 4c1d9e2c0f ARTEMIS-742 = test fixes
https://issues.apache.org/jira/browse/ARTEMIS-742
2016-09-23 08:18:03 +01:00
Francesco Nigro c002cf13b8 ARTEMIS-743 Created QueueConfig that replace and enable additional behaviours on QueueFactory.
Added Filter predicate.
2016-09-22 15:45:14 +01:00
Clebert Suconic 113c0c9360 ARTEMIS-738 Improving TX support on AMQP
https://issues.apache.org/jira/browse/ARTEMIS-738
2016-09-21 18:14:38 -04:00
Clebert Suconic 911ec30be1 ARTEMIS-740 Test on redeployment divert 2016-09-21 17:07:02 -04:00
Martyn Taylor 74742dcb66 Add Unique ClientID on Server 2016-09-16 16:05:20 +01:00
Howard Gao 406d09d986 ARTEMIS-728 Broker doesn't support unique jms client-id (qpid-jms client) 2016-09-15 11:17:02 -04:00
Jeff Mesnil c33f29631f ARTEMIS-714 Add suport for DataSource and SQLProvider
* add DataSource property to DatabaseStorageConfiguration to be able to
  communicate with the data store using this DataSource instance instead
  of relying on the creation the SQL connnection using the JDBC connection
  URL/driver class name tuple.
* add SQLProvider.Factory property to DatabaseStorageConfiguration to
  externalize the choice of the SQLProvider instead of relying on
  hard-coded choices. If the property is null, the current behaviour will
  be used (determing the SQLProvider based on the driver class name)
* bindingsJournal and messageJournal are already started in the start()
  method. Remove redundant calls that were creating unused JDBC
  connections that are never closed.

JIRA: https://issues.apache.org/jira/browse/ARTEMIS-714
2016-09-15 11:15:24 -04:00
Clebert Suconic 2ed51bf327 ARTEMIS-734 adding tests showing the issue on expiring while inside the cluster bridge 2016-09-15 16:02:49 +01:00
Ville Skyttä 7bff07d5b1 Add missing @Overrides 2016-09-14 13:22:20 +03:00
Clebert Suconic 665281a558 Updating ActiveMQ into OpenWire tests
This will fix the testsuite for activemq5-unit-tests
2016-09-13 17:17:12 -04:00
Clebert Suconic e81d101610 ARTEMIS-727 Fixing compilation on OpenWire tests 2016-09-12 19:10:28 -04:00
Clebert Suconic f8278ec99c ARTEMIS-727 Improving Thread usage on JDBC
https://issues.apache.org/jira/browse/ARTEMIS-727
2016-09-12 14:32:40 -04:00
Andy Taylor cdb0391c1c ARTEMIS-723 - AMQP subscriptions aren't deleted properly
https://issues.apache.org/jira/browse/ARTEMIS-723
2016-09-12 10:27:49 +01:00
Clebert Suconic 46d3f4abcc Version upgrades 2016-09-09 14:49:33 -04:00
Timothy Bish 42ff4a6048 ARTEMIS-722 Add DELAYED_DELIVERY capability to server connection open
The server should indicate to clients that it supports the message
annotation that allows message delivery to be delayed
'x-opt-delivery-time'
2016-09-08 19:01:40 -04:00
Clebert Suconic 87d3c1c9bd ARTEMIS-716 max replication = 0 should mean do not make copies at all 2016-09-08 17:17:04 +01:00
Clebert Suconic 505b732843 [maven-release-plugin] prepare for next development iteration 2016-09-06 12:17:31 -04:00
Clebert Suconic b305e231ec [maven-release-plugin] prepare release 1.4.0 2016-09-06 12:17:08 -04:00
jbertram 4bece40706 Fix test race condition 2016-09-06 09:26:59 -05:00
Clebert Suconic 4472aa0e36 ARTEMIS-581 Implement max disk usage, and global-max-size
max-disk-usage = how much of a disk we can use before the system blocks
global-max-size = how much bytes we can take from memory for messages before we start enter into the configured page mode

This will also change the default created configuration into page-mode as that's more reliable for systems.
2016-09-06 15:07:49 +01:00
Howard Gao ec0f05f93d ARTEMIS-706 No Keep Alives from Broker (test improvement)
-- make the test run quicker
2016-09-06 00:12:54 +08:00
Howard Gao 61747acfd1 ARTEMIS-706 No Keep Alives from Broker 2016-09-02 21:39:44 -04:00
jbertram 1cf96f4fcf ARTEMIS-711 Fix handling of 'bare' header 2016-09-01 15:23:48 -04:00
Clebert Suconic 03b938468a ARTEMIS-657 Fixing JORAM AMQP Tests 2016-08-31 14:26:10 -04:00
Howard Gao 8fccd5df42 ARTEMIS-696 Broker fails when client sends messages in multiple transfer frames 2016-08-30 17:24:31 -04:00
Gordon Sim 8f188ef236 ARTEMIS-657: ensure management response bodies are encoded into amqp 2016-08-30 17:12:19 -04:00
Clebert Suconic 6a1a1b085f removing System.exit from test 2016-08-26 15:11:48 -04:00
Ville Skyttä 4ef9c5e238 Javadoc error fixes 2016-08-25 14:22:32 -04:00
Ville Skyttä d5242978d5 for and while loop to foreach conversions 2016-08-25 14:22:32 -04:00
Ville Skyttä e1728f0797 Spelling fixes 2016-08-25 14:22:32 -04:00
Ville Skyttä 30c617da3c Unnecessary @SuppressWarnings fixes 2016-08-25 14:22:32 -04:00
Clebert Suconic 858d7a1a02 ARTEMIS-697 Making JChannelManager a singleton, and fixing tests 2016-08-24 18:08:17 -04:00
Clebert Suconic 92c5d5cd50 ARTEMIS-684 Random is not equaly distributed among different VMs 2016-08-23 19:36:54 -04:00
Clebert Suconic a054713424 1.5.0.SNAPSHOT on extra-tests 2016-08-16 16:21:27 -04:00
Clebert Suconic a3840c23c3 [maven-release-plugin] prepare for next development iteration 2016-08-16 11:59:55 -04:00
Clebert Suconic d38ef19bf6 [maven-release-plugin] prepare release 1.4.0 2016-08-16 11:59:36 -04:00
Clebert Suconic 18563e4539 ARTEMIS-591 Improvement on Timeout check 2016-08-15 14:09:37 -04:00
jbertram cfbe06f3bc ARTEMIS-656 support host verification for SSL cert 2016-08-15 13:58:25 -04:00
Bennet Schulz 4ae18782da ARTEMIS-680 some refactorings within Vert.X integration and corresponding tests 2016-08-14 12:48:35 -04:00
jbertram b54de460c6 ARTEMIS-592 finer-grained security for queues 2016-08-11 18:32:54 -04:00
Clebert Suconic 7d684956e2 ARTEMIS-670 Adjusting package names on CLI and adding input for destination create name 2016-08-10 19:12:58 -04:00
Howard Gao 76e7992906 ARTEMIS-670 Adding destination creation and deletion cli commands 2016-08-10 15:44:10 -04:00
Martyn Taylor 7afd0fb028 ARTEMIS-677 Support websocket subprotocol handshakes 2016-08-10 11:07:47 -04:00
Clebert Suconic 04d482037c ARTEMIS-601 Implementing reload manager on JMS Destinations and Address Settings 2016-08-10 10:03:40 -04:00
Gordon Sim 7a012008b7 ARTEMIS-447: add name and version to properties in amqp open frame 2016-08-10 08:56:44 -04:00
Ville Skyttä 330c65ba35 Remove unnecessary @SuppressWarnings("unchecked") 2016-08-09 11:24:22 +01:00
Clebert Suconic 579d6226aa ARTEMIS-671 Returning messages after connection killed, and validating usage of reconnect 2016-08-09 11:23:46 +01:00
Howard Gao 2fb8341f8d ARTEMIS-604 - Add checks for object messages in REST and AMQP
- Rest interface fix
  - Doc fixes (Rest->REST)
  - JSON management and AMQP outbound
2016-08-09 11:22:48 +01:00
Howard Gao 0535218cfc ARTEMIS-604 - Message Serialization Improvement
- JMS and RA fixes
2016-08-09 11:22:48 +01:00
Martyn Taylor 0af13e0d03 ARTEMIS-669 Do binding query on sender link attach
QueueQuery was previously used instead of checking for bindings on a
particular address name.  This meant sending and receiving only worked
for those queues that happened to have the same queueName to address.
This patch replaces this with binding check.

There's also some minor ProtonTest fixes included.
2016-08-09 08:21:41 +01:00
Martyn Taylor 2f721866ab ARTEMIS-636 Add AMQP Hard Soft Limit for BLOCK 2016-08-05 15:29:01 +01:00
bayern39 a741642a48 [ARTEMIS-642] Disable slow client reconnecting with KILL slow client policy 2016-08-03 18:39:57 -04:00
Martyn Taylor ab39e70dc9 ARTEMIS-666 Fix AMQP error message on address not found 2016-08-03 13:28:34 +01:00
Gordon Sim bac991215d ARTEMIS-446: use name from broker.xml as container id in AMQP open frame 2016-08-03 12:03:25 +01:00
jbertram a69ce7bc81 Fix AcceptorControlUsingCoreTest 2016-08-02 12:56:01 -05:00
Clebert Suconic 5d11967ed4 ARTEMIS-659 Remove unneeded CDI dependency 2016-08-01 15:50:39 -04:00
jbertram 7917f4d2f2 ARTEMIS-565 JSON fixes 2016-08-01 10:21:31 -05:00
Ville Skyttä 29deb12ddb ManagementContext.queryNames returns ObjectNames 2016-07-29 15:38:08 -04:00
Ville Skyttä 1bc42be7ff Access static fields and methods directly 2016-07-29 15:38:08 -04:00
Ville Skyttä 17aca72516 Remove unnecessary field override 2016-07-29 15:38:08 -04:00
Ville Skyttä eb5eca93b0 Fix check for KahaDB adapter in DurableSubsOfflineSelectorIndexUseTest 2016-07-29 15:35:25 -04:00
Ville Skyttä c890164fda Use try-with-resources some more 2016-07-29 15:32:57 -04:00
Ville Skyttä a6a03d4985 Fix journal compact test slow appender loop counters 2016-07-28 23:30:02 +03:00
Ville Skyttä fa191ba4c6 Fix JMS message null byte array equality tests 2016-07-28 23:30:02 +03:00
Ville Skyttä 0aa7dd1905 Fix Netty topology factory class test 2016-07-28 23:30:02 +03:00
Ville Skyttä 8562b8b448 Fix check for cursor complete in page cleanup test 2016-07-28 23:30:02 +03:00
Ville Skyttä 83adee59b2 Fix nonexistent property test for bytes 2016-07-28 23:30:02 +03:00
Ville Skyttä 04eed1b7f4 Fix some potential NPEs in examples and tests 2016-07-28 23:30:02 +03:00
Ville Skyttä 61222233ca Fix SslTransportFactoryTest bind want/need auth test combinations 2016-07-28 23:30:02 +03:00
jbertram 8600ebd64d ARTEMIS-565 fix TopicControlUsingJMSTest 2016-07-28 15:22:52 -04:00
Clebert Suconic 85878513a5 This closes #679 2016-07-28 12:32:36 -04:00
Ville Skyttä f57b937cdd Remove unused imports 2016-07-28 12:28:19 -04:00
Ville Skyttä 559ae07f2f Use System.arraycopy for copying array 2016-07-28 12:28:18 -04:00
Ville Skyttä 68c7c2575d Remove dead code 2016-07-28 12:28:18 -04:00
jbertram 1ca5b19a10 ARTEMIS-565 additional JSON fixes 2016-07-28 11:33:19 -04:00
Ville Skyttä b2a9be1373 Spelling fixes 2016-07-28 18:14:35 +03:00
Ville Skyttä 429e1e84d4 Remove unnecessary casts 2016-07-28 18:12:59 +03:00
Ville Skyttä b0815c6a4e Remove unnecessary semicolon 2016-07-28 18:11:28 +03:00
Clebert Suconic 8873744d27 ARTEMIS-565 fixing JMS Control stuff 2016-07-27 19:14:32 -04:00
jbertram 3914f1aa8b ARTEMIS-647 track 'killed' msg count on queue
A 'killed' message is one that has been sent to a dead-letter address
or otherwise removed from the queue due to exceeding the max delivery
attempts.
2016-07-27 16:44:59 -04:00
jbertram a80c2bb442 ARTEMIS-565 more JSON fixes 2016-07-27 11:53:21 -05:00
jbertram 32abe61876 ARTEMIS-646 track expired msg count on queue 2016-07-26 16:15:02 -05:00
Clebert Suconic 76938fe44a ARTEMIS-565 more tweaks on the JSON replacement 2016-07-26 16:05:17 -04:00
Andy Taylor 85ede22c3c ARTEMIS-655 - [AMQP] On transacted session.commit() of receiver client, messages are read, but queue is not cleared out
Making sure that when a transaction state of accepted is returned we actually ack the message

https://issues.apache.org/jira/browse/ARTEMIS-655
2016-07-26 14:30:11 -04:00
jbertram 5d71ffc5e6 ARTEMIS-587 add more JSON JMX mgmt methods to core 2016-07-26 11:39:19 -04:00
Martyn Taylor 64e95b9b91 This closes #665 2016-07-26 15:14:40 +01:00
Ville Skyttä aed49b3894 Spelling fixes 2016-07-26 14:24:45 +03:00
Martyn Taylor b549bb243c Add default AMQP flow behaviour and fix proton test 2016-07-26 11:14:25 +01:00
John D. Ament d0ecf0f3a5 ARTEMIS-565 Replace json.org with javax.json
Javax.json is a newer JSR, but has an ASF compliant version, is pretty close to the original JSON.org API and will support a standard annotation based JSON-B solution at some point soon.
Updated integration tests and removed JSON.org from license.
2016-07-25 21:44:57 -04:00
Martin Styk c9dfbad69c ARTEMIS-651 Typo in word "topology" in class ServerLocatorImpl 2016-07-25 14:26:47 -04:00
jbertram 778bd8361a ARTEMIS-650 clarify doc, use TTL default for 0 heartbeat 2016-07-25 16:27:30 +01:00
jbertram c4a7ddf9d6 ARTEMIS-548 Stomp durable sub unsubscrbe
Implement ability for Stomp clients to unsubscribe durable
subscriptions.
2016-07-25 16:23:06 +01:00
Erich Duda d0cb3b1d17 ARTEMIS-645 ClusteredGroupingTest fails
In testGroupingSendTo3queuesNoConsumerOnLocalQueue the batch
of messages can be received also by the second consumer. It
depends on cluster decision.
2016-07-25 10:53:48 +01:00
jbertram 7d8f9dcec6 ARTEMIS-611 send ERROR in case of TTL violation
I changed the message for TTL timeouts because the existing message was
a bit verbose and a bit speculative. Also, now that the broker supports
more protocols the bit about connection-ttl and
client-failure-check-period is less relevant.
2016-07-20 15:54:29 -05:00
Erich Duda f4a0763baf ARTEMIS-643 wrong paths in restricted-security-client.policy
user.dir points to current working directory from which the maven command
was invoked. If the command is not invoked from project root directory,
the generated paths are wrong what causes failures of some tests.
2016-07-20 14:15:14 +01:00
jbertram b466cce593 ARTEMIS-234 fix content-length for Stomp 1.0 2016-07-20 13:40:57 +01:00
Martyn Taylor 4d60ced581 ARTEMIS-636 Implement AMQP AddressFull BLOCK 2016-07-20 10:33:44 +01:00
Martyn Taylor 5dfa1c59fb ARTEMIS-638 Only allocate credits once Link Attach 2016-07-20 10:33:44 +01:00
Martyn Taylor df41a60e21 ARTEMIS-637 Port 5.x AMQP test client 2016-07-20 10:33:44 +01:00
Ville Skyttä 39edf958a1 Add missing @Override annotations 2016-07-19 16:09:12 +01:00
jbertram 89e0c461e5 ARTEMIS-611 refactor STOMP cxn TTL + heart-beat
Adds 3 new URI properties for STOMP acceptors to allow finer grained
configuration of heart-beat / connection-TTL behavior.
2016-07-18 17:10:05 -05:00
jbertram dc76e2a6a0 ARTEMIS-640 Allow config of cxn TTL check interval
Add connection-ttl-check-interval configuration attribute to allow
control of how frequently connection TTL checks are performed.
2016-07-18 17:06:26 -05:00
Erich Duda 4d16c0721a ARTEMIS-634 JMSQueueControlUsingJMSTest fails
We have to wait some time until Artemis delivers all messages.
2016-07-15 09:38:17 -05:00
Jiri Danek e6085dd98f ARTEMIS-628 - Fix mismatched signatures in activemq5-unit-tests subproject
Previous commit added one more parameter to new Role() but the tests were not updated
2016-07-15 09:32:37 -05:00
Erich Duda aebf87aeee ARTEMIS-632 JMSServerControlUsingJMSTest fails
The testRemoteClientIDConnection fails. The failure occurs when
connection objects are destroyed by garbage collector before time.
2016-07-15 09:30:53 -05:00
Erich Duda 2ad8d6a504 ARTEMIS-342 NettySecurityClientTest fails
Security client requires additional permissions.
2016-07-15 09:30:26 -05:00
Erich Duda da9d67335d ARTEMIS-621 Several tests do not use getUDPDiscoveryAddress
Fixing the commit 8fdc7a6788
2016-07-15 09:29:44 -05:00
jbertram 8a66d5f485 ARTEMIS-573 clarify filter documentation 2016-07-14 11:29:05 +01:00
jbertram e9db9c286d ARTEMIS-628 add BROWSE role 2016-07-12 16:21:57 -05:00
Erich Duda 8fdc7a6788 ARTEMIS-621 Several tests do not use getUDPDiscoveryAddress 2016-07-11 13:46:08 -04:00
Francesco Nigro 36555a10c5 ARTEMIS-623/ARTEMIS-622 Added memory mapped impl of Sequential File + benchs.
Added experimental GCFree Journal impl + benchs + Sequentially Encoded Aligned Binary Protocol.

https://issues.apache.org/jira/browse/ARTEMIS-622
https://issues.apache.org/jira/browse/ARTEMIS-623
2016-07-11 13:36:47 -04:00
Clebert Suconic 246d11c6b1 ARTEMIS-616 Use Call timeout on replication flow control 2016-07-06 19:12:25 -04:00
jbertram 4f36033c28 ARTEMIS-584 fix test 2016-07-06 19:11:13 -04:00
Jiri Danek 172c696865 NO-JIRA Clean up xml files
Duplicated dependency declarations on a few pom.xml files were causing the Maven warnings.  These duplicated dependencies were removed.
File `server-start-stop-backup-jms-config1.xml` was malformed. A missing quotation mark was added.
2016-07-06 17:16:16 -04:00
jbertram 765b225924 ARTEMIS-584 add validated user to msg
Implements a new feature to aid in security auditing by adding the name
of the validated user to the messages it sends.
2016-07-06 09:37:29 -05:00
barreiro b8d6a374a0 More changes on the reclaimer for better performance 2016-07-05 23:28:00 -04:00
John D. Ament 7c746c719e ARTEMIS-607 Added interceptor support for MQTT protocol.
Also updated the maintainer's guide to clarify what is run in the PR builder.
2016-07-05 19:43:00 -04:00
Clebert Suconic 05ac53a305 ARTEMIS-409 fixing test 2016-07-05 19:41:49 -04:00
Clebert Suconic 8154120027 ARTEMIS-612 Improving Failback's max replication
The server will always restart now, with older files being removed.
The system will now move current data into ./oldreplica.#, and remove old ones.
All the logic for moving these files is encapsulated at FileMoveManager.
2016-07-05 16:51:23 -05:00
Ville Skyttä 358aff4892 Remove unused import 2016-07-05 14:18:01 -04:00
Martyn Taylor 515b5aba89 Upgrade ApacheRat to 0.12 2016-07-04 17:31:15 +01:00
Erich Duda 45e4138fad ARTEMIS-606 JMSServerControl2Test#testCloseConsumerConnectionsForAddressForInVM fails
Based on log it is clear that the connection was closed by Finalizer before the failure
was caused by the test itself. Since the connection variable is not referenced in the
code anymore, JVM concludes it can destroy the object. Especially IBM JDK does it very
fast.
2016-07-01 19:34:43 -04:00
Clebert Suconic 5dc5a242bb ARTEMIS-577 & ARTEMIS-596 Fixing API compatibility.
This is also fixing a build issue.
2016-06-27 12:08:11 -04:00
jbertram ce9ea1760a ARTEMIS-569 fix bridge producerWindowSize
Something bizarre happened with commit
8f52a622d0 in April 2015. It reverted the
changes from both c1111cc156 and
ada112a6a3. This commit fixes that.
2016-06-24 16:54:48 -05:00
Tom Ross 5bca681c1a ARTEMIS-596 JMS Bridge messages should be identified.
In cases where there are many JMS bridges defined on a broker it should
be possible to identify any error message by a bridge name.
2016-06-24 16:11:29 +01:00
Timothy Bish 75f18d1e10 ARTEMIS-585 support send on dynamic sender link
The sender abstraction must be able to update its sender address in the
case of dynamic senders whose target address is not set until the code
initializes the link and creates a destination for it.
2016-06-21 09:33:33 -04:00
Howard Gao 109ce6ded9 ARTEMIS-571 Fix issues in openwire testsuite
* Redelivery count fix
* Regression in BrokerTest
2016-06-17 14:58:54 -04:00
jbertram 7715b5ee12 ARTEMIS-529 support dual auth
A new feature whereby 2-way SSL connections can be authenticated differently
than non-SSL connections.
2016-06-17 11:07:03 -05:00
Ville Skyttä 2edfab22aa Fix/update some links in docs 2016-06-17 11:59:28 +03:00
Ville Skyttä 33a51223b0 Remove redundant type arguments 2016-06-14 20:50:21 -04:00
Ville Skyttä 3923ae45f4 Fix checkstyle redundant modifier violations 2016-06-13 20:03:54 +03:00
Ville Skyttä e493748040 Fix checkstyle curly brace violations 2016-06-13 18:21:43 +03:00
Ville Skyttä fb56cc7414 Update maven-checkstyle-plugin to 2.17 2016-06-13 16:46:41 +03:00
jbertram ff92f98983 Fix possible leaks in LDAP tests 2016-06-09 14:07:51 -04:00
Clebert Suconic 249056367d Fixing a few intermittent test failures 2016-06-09 10:10:58 -04:00
Martyn Taylor 9ae39f663f [maven-release-plugin] prepare for next development iteration 2016-06-09 12:52:56 +01:00
Martyn Taylor 221039e353 [maven-release-plugin] prepare release 1.3.0 2016-06-09 12:49:13 +01:00
Martyn Taylor 319439ab27 [maven-release-plugin] prepare for next development iteration 2016-06-09 12:25:19 +01:00