Merge branch 'develop' of github.com:Qi4j/qi4j-sdk into develop
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/6ea04570 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/6ea04570 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/6ea04570 Branch: refs/heads/master Commit: 6ea045707bc904286b3b795a396401bfac1698a5 Parents: ccab7ae d7af915 Author: Niclas Hedhman <[email protected]> Authored: Mon Aug 25 21:34:53 2014 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Mon Aug 25 21:34:53 2014 +0800 ---------------------------------------------------------------------- build.gradle | 4 +- .../bootstrap/builder/ApplicationBuilder.java | 1 + .../runtime/composite/FragmentClassLoader.java | 65 +++++-- .../runtime/composite/TransientClassLoader.java | 34 ++-- .../qi4j/runtime/composite/MapOverrideTest.java | 71 ++++---- .../runtime/composite/TransientAsClassTest.java | 40 +++++ .../hazelcast/HazelcastEntityStoreMixin.java | 6 +- extensions/entitystore-jclouds/build.gradle | 2 - .../jclouds/JCloudsMapEntityStoreMixin.java | 175 ++++++++++--------- .../mongodb/MongoEntityStoreConfiguration.java | 2 - .../mongodb/MongoMapEntityStoreMixin.java | 27 ++- .../jackson/JacksonValueDeserializer.java | 16 +- .../jackson/JacksonValueSerializer.java | 8 +- gradle/wrapper/gradle-wrapper.jar | Bin 51106 -> 51348 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- libraries.gradle | 90 +++++----- 16 files changed, 312 insertions(+), 233 deletions(-) ----------------------------------------------------------------------
