Migration to spring 3.2.1