added openjpa
finish
Merge branch 'upstream'