changed from Jetty to Apache and moved toward being able to support Java 6