Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1653

This commit is contained in:
Greg Wilkins 2017-06-29 08:12:11 +02:00
parent 432b941f32
commit 7e46285149
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClasspathPattern.java
View File

@ -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

33
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
View File

@ -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)
{