changed xml conf to java-config