Port to Jersey/JAX-RS 2.0