Upgrading to Spring 3.0