Correct CDI & JAX-RS scope
Change resolver to support different way of resolving Session