Merge branch 'release/2.0'
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/a675e78c Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/a675e78c Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/a675e78c Branch: refs/heads/master Commit: a675e78c56d9a317af6079ef696b94c070faeabb Parents: b43c098 e326fe7 Author: Paul Merlin <[email protected]> Authored: Fri Apr 26 18:20:56 2013 +0200 Committer: Paul Merlin <[email protected]> Committed: Fri Apr 26 18:20:56 2013 +0200 ---------------------------------------------------------------------- README.txt | 34 +--- build.gradle | 2 - .../api/service/importer/NewObjectImporter.java | 2 +- .../dataset/iterable/IterableDataSetTest.java | 2 + .../runtime/composite/CompositeMethodModel.java | 4 +- .../qi4j/runtime/property/PropertyModel.java | 2 +- .../ConcurrentModificationCheckConcern.java | 53 +++--- libraries.gradle | 2 +- .../jmx/CircuitBreakerManagementSample.java | 113 +++++++++++ .../jmx/CircuitBreakerManagementTest.java | 113 ----------- .../server/DomainEventSourceResourceSample.java | 186 +++++++++++++++++++ .../server/DomainEventSourceResourceTest.java | 186 ------------------- .../trace/service/TraceServiceMixin.java | 4 +- .../rdf/repository/MemoryRepositoryService.java | 21 ++- .../rdf/repository/NativeRepositoryService.java | 6 + .../rdf/repository/RdbmsRepositoryService.java | 6 + .../org/qi4j/library/rest/admin/RestTest.java | 1 + .../uid/sequence/PersistingSequencingTest.java | 5 +- .../uid/sequence/TransientSequencingTest.java | 3 +- 19 files changed, 379 insertions(+), 366 deletions(-) ----------------------------------------------------------------------
