Finished migrating to Spring 3.1.