Patch to work with Spring 3.2.0 and compile with Ant 1.8