refactor to support jetty 8.1 and infinispan 5.2