refactor to JavaConfig
change to mapping DSL
remove unnecessary log4j.xml