updated to JAX-RS