Update to move from Jersey to Apache CXF and Spring