Could you please format this using the Hibernate code style? At the moment this will not apply cleanly, but I believe most of that is dues to lots of unnecessary changes due to styling (import order, spaces v. tabs, etc)