migrated some xmls to annotation-based java configs