Finish CSW services migrated to Spring MVC