Simplified persistence xml and migrated it to 4.0 Hibernate version