Upgraded to spring security 3.1