Fix hibernate test issues caused by idGenerator move.
Secound, and final, round of spring fixes. Change datasource to H2 instead of derby.