OK. I'm done with the merge. Since we moved from incubator to TLP during the development of the roller_4.0_newbackend branch, I was unable to do a real merge from branch to trunk. Instead I had to do the merge "by hand." It was painful, but on on the bright side I was able to look very closely at each change and I caught some problems before doing the final commit.
I broke the commits into separate chunks and committed the possibly questionable bits first: URL: http://svn.apache.org/viewvc?view=rev&rev=541450 New "core" component with shared DB code URL: http://svn.apache.org/viewvc?view=rev&rev=541452 Changes to tests. Probably should have been committed to trunk long ago. All should be safe: they simply ensure that 1) tests work against managed objects only and 2) relationships are maintained on both sides. URL: http://svn.apache.org/viewvc?view=rev&rev=541454 Changes to ensure that relationships are maintained on both sides. URL: http://svn.apache.org/viewvc?view=rev&rev=541456 Change to ensure that read-only collection returned by back-end is not modified And finally, the not-so-questionable bits: URL: http://svn.apache.org/viewvc?view=rev&rev=541458 Remainer of JPA changes/additions JPA is now the default back-end in the trunk, we're using Apache OpenJPA 0.9.7, Planet and Roller unit tests are passing 100% and I did some sanity testing on Roller (posting entries, comments, etc.) - Dave
