Updated to JPA 2 and ammended eclipse formatting