more jdo changes
Updated to use JPA
updates for use with JPA