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

more javadoc fixes #2056 

Signed-off-by: olivier lamy <olamy@webtide.com>
This commit is contained in:
olivier lamy 2018-01-08 16:10:52 +11:00
parent 1a49a6fb7e
commit 083c8045e8
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java
View File

@ -45,13 +45,6 @@ public class JettyTldPreScanned extends TldPreScanned
{
private final Collection<URL> _jettyPreScannedURLs;
/**
* @param context
* @param namespaceAware
* @param validation
* @param blockExternal
* @param preScannedTlds
*/
public JettyTldPreScanned(ServletContext context, boolean namespaceAware, boolean validation, boolean blockExternal, Collection<URL> preScannedTlds)
{
super(context, namespaceAware, validation, blockExternal, preScannedTlds);

4
jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
View File

@ -96,8 +96,10 @@ public class QuickStartDescriptorGenerator
/**
* @param w the source WebAppContext
* @param extraXML any extra xml snippet to append
* @param originAttribute param value to use for the context param origin attribute
* @param generateOrigin <code>true</code> to generate the origin attribute
*/
public QuickStartDescriptorGenerator (WebAppContext w, String extraXML, String originAttribute, boolean generateOrigin)
public QuickStartDescriptorGenerator (WebAppContext w, String extraXML, String originAttribute, boolean generateOrigin)
{
_webApp = w;
_extraXML = extraXML;

9
jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
View File

@ -80,13 +80,20 @@ public class ServerContainer extends ClientContainer implements javax.websocket.
/**
* @deprecated use {@code ServerContainer(NativeWebSocketConfiguration, HttpClient)} instead
* @param configuration the {@link NativeWebSocketConfiguration} to use
* @param executor not used
*/
@Deprecated
public ServerContainer(NativeWebSocketConfiguration configuration, Executor executor)
{
this(configuration, (HttpClient) null);
}
/**
*
* @param configuration the {@link NativeWebSocketConfiguration} to use
* @param httpClient the {@link HttpClient} instance to use
*/
public ServerContainer(NativeWebSocketConfiguration configuration, HttpClient httpClient)
{
super(configuration.getFactory(), httpClient);

7
jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
View File

@ -132,6 +132,9 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
/**
* Embedded Jetty approach for non-bytecode scanning.
* @param context the {@link ServletContextHandler} to use
* @return a configured {@link ServerContainer} instance
* @throws ServletException if the {@link WebSocketUpgradeFilter} cannot be configured
*/
public static ServerContainer configureContext(ServletContextHandler context) throws ServletException
{
@ -170,6 +173,10 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
/**
* @deprecated use {@link #configureContext(ServletContextHandler)} instead
* @param context not used
* @param jettyContext the {@link ServletContextHandler} to use
* @return a configured {@link ServerContainer} instance
* @throws ServletException if the {@link WebSocketUpgradeFilter} cannot be configured
*/
@Deprecated
public static ServerContainer configureContext(ServletContext context, ServletContextHandler jettyContext) throws ServletException