Refactor spring-config.xml