commit a4cf7d654bf839129d0cb0e9c5bf7f2585e5afe6
author Joakim Erdfelt <joakim.erdfelt@gmail.com> Mon Dec 14 11:22:24 2015 -0700
committer Joakim Erdfelt <joakim.erdfelt@gmail.com> Thu Dec 17 14:38:55 2015 -0700
tree ffae2bd1eaf00f555e02d966aacaacaf4a0b5d92
parent 31cd3fee84fb6b9644056a32159d83854aed9c4a

482042 - New API, Allow customization of ServletHandler path mapping

+ Swapping out PathMap for PathMappings in ServletHandler

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java

jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java

diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
index ebafc96..d7accdf 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
@@ -53,6 +53,8 @@
 import org.eclipse.jetty.http.pathmap.PathMappings;
 import org.eclipse.jetty.http.pathmap.PathSpec;
 import org.eclipse.jetty.http.pathmap.ServletPathSpec;
+import org.eclipse.jetty.http.pathmap.PathSpec;
+import org.eclipse.jetty.http.pathmap.ServletPathSpec;
 import org.eclipse.jetty.security.IdentityService;
 import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.server.Request;