Upgrading Spring XSD to 3.1.