Ok, everything looks fine to me. I don't worry too much if there are some minor mistakes here and there. v2.0 will be going through a lot of scrutiny, development, new testcases, new programming language and what not, so I am sure such mistake will pale in comparison and likely to be detected.
So, please feel free to go ahead with the merge and pull request. Once that is done, I'll take a crack at the NamedAssociations again (unless we end up with a totally different approach...) Thanks a lot for the hard work. Niclas On Tue, Sep 27, 2011 at 1:11 AM, Paul Merlin <[email protected]> wrote: > On Mon, 26 Sep 2011 08:49:56 +0200, Paul Merlin wrote: >> >> After taking a closer look here are the changes I spotted in >> libraries/extensions excluding NamedAssoc related ones: >> >> * libraries >> * alarm: documentation + fixes >> * cfx: CXF version update + changes fixing tests >> * fileconfig: Added FileConfigurationOverride >> * scheduler: Minor assembly helpers >> * various: impact of changes in core/extensions >> >> * extensions >> * cache-ehcache: configuration fixes >> * entitystore-file: javadocs >> * entitystore-sql & indexing-sql: major fix for derby support >> * entitystore-hazelcast: configuration enhancements at least >> * various: impact of changes in core/extensions > > Ok, I previously missed these ones: > > * libraries > * eventsourcing: Fixed javadoc errors. Made some fields private. > * libraries and extensions > * RDF lifecycle fixes > * Removal of ManyAssocDescriptor : no need to be merged, develop already > has it > * sdk > * Envisage: fixed spi dependency scope from testRuntime to compile > * New tests cases for issues > * Various clean up in checkstyle configuration, build.gradle and cargo > sample > > In the meantime I did the merge in the "Applying_1.4_to_develop" branch. > It was a pretty tedious task, I hope I did it well and nobody would need to > do > it again. I cherry picked every interesting commits except the ones about > NamedAssoc. I had simple conflicts around commits that used to trigger > conflicts > when they occured in the past, so no big surprise. > > BTW I fixed the CXF DividendsTest that was platform dependant plus a minor > fix to > core/runtime for the very same test to pass, simple null handling. As I do > not > have commit rights on the core repository I forked it here: > https://github.com/eskatos/qi4j-core/tree/Applying_1.4_to_develop > > Everything compiles and remaining failing tests are the very same as before > the > merge except org.qi4j.test.composite.CleanStackTraceTest that was easy to > fix. > > Here are the still failing tests: > * org.qi4j.api.value.ValueCompositeTest > * org.qi4j.runtime.objects.ObjectBuilderFactoryTest > * org.qi4j.entitystore.file.FileEntityStoreTest > > > Before sending the pull request for core and merging the > "Applying_1.4_to_develop" > branch in sdk, libraries and extensions, could you review the changes, it > should > be pretty clear using the github ui: > > https://github.com/Qi4j/qi4j-sdk/commits/Applying_1.4_to_develop > https://github.com/Qi4j/qi4j-libraries/commits/Applying_1.4_to_develop > https://github.com/Qi4j/qi4j-extensions/commits/Applying_1.4_to_develop > > And the fix I did along the way in core: > > https://github.com/eskatos/qi4j-core/commit/24a8930a173dc9cbcb4b228513726e968a3fec13 > > > I hope this helps. > > /Paul > > > -- > Paul Merlin - eskatos.github.com > > _______________________________________________ > qi4j-dev mailing list > [email protected] > http://lists.ops4j.org/mailman/listinfo/qi4j-dev > -- Niclas Hedhman, Software Developer http://www.qi4j.org - New Energy for Java I live here; http://tinyurl.com/3xugrbk I work here; http://tinyurl.com/24svnvk I relax here; http://tinyurl.com/2cgsug _______________________________________________ qi4j-dev mailing list [email protected] http://lists.ops4j.org/mailman/listinfo/qi4j-dev
