upgraded jetty and tomcat, first pass at jersey 2x integration