Updated spring file naming to match project convention
Updated cxf codegen options to explicitly match its defaults