moving to Java Config from XML config