Updated for Spring 3.2, java 1.7, gradle 1.5.