first step of migration to Spring 3.2 (still in process)