refactor applicationContext-common.xml move beans to javaconfig