JBWS-3643:Refactor EndpointRegistry