Small refactors. enable spring mvc alongside cxf-rest