More spring configuration moved to javaconfig instead of xml-files