From 7e462851492e8235255b122678383e09e4f05eb5 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Thu, 29 Jun 2017 08:12:11 +0200
Subject: [PATCH] Fix #1653

---
 .../jetty/webapp/ClasspathPattern.java        |  2 +-
 .../eclipse/jetty/webapp/WebAppContext.java   | 33 +++++++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java
index 9c224ef9ff0..5c089b1a331 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java
@@ -43,7 +43,7 @@ import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.resource.Resource;
 
 /**
- * Classpath classes list performs sequential pattern matching of a class name 
+ * Classpath classes list performs pattern matching of a class name 
  * against an internal array of classpath pattern entries.
  * A class pattern is a string of one of the forms:<ul>
  * <li>'org.package.SomeClass' will match a specific class
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
index 070c670bd1c..5268e9e9c8a 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
@@ -702,6 +702,10 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     }
 
     /* ------------------------------------------------------------ */
+    /**
+     * @deprecated Use {@link #getServerClasspathPattern()}.{@link ClasspathPattern#add(String)}
+     * @param classOrPackageOrLocation pattern (see {@link ClasspathPattern}
+     */
     @Deprecated
     public void addServerClass(String classOrPackageOrLocation)
     {
@@ -713,13 +717,10 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
 
     /* ------------------------------------------------------------ */
     /** Prepend to the list of Server classes.
-     * @param classOrPackage A fully qualified class name (eg com.foo.MyClass) 
-     * or a qualified package name ending with '.' (eg com.foo.).  If the class 
-     * or package has '-' it is excluded from the server classes and order is thus
-     * important when added system class patterns. This argument may also be a comma 
-     * separated list of classOrPackage patterns.
+     * @param classOrPackage A pattern.
      * @see #setServerClasses(String[])
      * @see <a href="http://www.eclipse.org/jetty/documentation/current/jetty-classloading.html">Jetty Documentation: Classloading</a>
+     * @deprecated Use {@link #getServerClasspathPattern()}.{@link ClasspathPattern#add(String)}
      */
     @Deprecated
     public void prependServerClass(String classOrPackage)
@@ -757,6 +758,11 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     }
 
     /* ------------------------------------------------------------ */
+    /**
+     * 
+     * @param classOrPackage pattern
+     * @deprecated Use {@link #getSystemClasspathPattern()}.{@link ClasspathPattern#add(String)}
+     */
     @Deprecated
     public void addSystemClass(String classOrPackage)
     {
@@ -769,13 +775,10 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
 
     /* ------------------------------------------------------------ */
     /** Prepend to the list of System classes.
-     * @param classOrPackage A fully qualified class name (eg com.foo.MyClass) 
-     * or a qualified package name ending with '.' (eg com.foo.).  If the class 
-     * or package has '-' it is excluded from the system classes and order is thus
-     * important when added system class patterns.This argument may also be a comma 
-     * separated list of classOrPackage patterns.
+     * @param classOrPackage A pattern.
      * @see #setSystemClasses(String[])
      * @see <a href="http://www.eclipse.org/jetty/documentation/current/jetty-classloading.html">Jetty Documentation: Classloading</a>
+     * @deprecated Use {@link #getSystemClasspathPattern()}.{@link ClasspathPattern#add(String)}
      */
     @Deprecated
     public void prependSystemClass(String classOrPackage)
@@ -787,6 +790,11 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     }
     
     /* ------------------------------------------------------------ */
+    /**
+     * @param name class name
+     * @return true if matched by {@link #getServerClasspathPattern()}
+     * @deprecated Use {@link #getServerClasspathPattern()}.{@link ClasspathPattern#match(String)}
+     */
     @Deprecated
     public boolean isServerClass(String name)
     {
@@ -797,6 +805,11 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     }
 
     /* ------------------------------------------------------------ */
+    /**
+     * @param name class name
+     * @return true if matched by {@link #getServerClasspathPattern()}
+     * @deprecated Use {@link #getSystemClasspathPattern()}.{@link ClasspathPattern#match(String)}
+     */
     @Deprecated
     public boolean isSystemClass(String name)
     {