Upgraded from Spring 2.5 to 3.0.5.RELEASE