Merge pull request #2793 from seratch/jetty-9.4.x-typo
Fix typos detected by github.com/client9/misspell
This commit is contained in:
Joakim Erdfelt
GitHub
commit
88b1a3d3d7
|
|
@ -34,7 +34,7 @@ string. The time the request thread is held by the servlet is displayed in red
|
|||
</tr>
|
||||
|
||||
</table>
|
||||
By the use of Asynchronous Servlets and the Jetty Asychronous client, the server is able to release the thread (green) while
|
||||
By the use of Asynchronous Servlets and the Jetty Asynchronous client, the server is able to release the thread (green) while
|
||||
waiting for the response from Ebay. This thread goes back into the thread pool and can service many other requests during the wait.
|
||||
This greatly reduces the number of threads needed, which in turn greatly reduces the memory requirements of the server.
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ Jetty supports interpretation and application of the following annotations:
|
|||
==== Discovered vs Introspected Annotations
|
||||
|
||||
Some types of annotation can be placed on any class, not necessarily just those with which the container interacts directly.
|
||||
These type of annotations are refered to as "discovered" to indicate that the container must take proactive action to go out and find them.
|
||||
These type of annotations are referred to as "discovered" to indicate that the container must take proactive action to go out and find them.
|
||||
The other type of annotation is call "introspected", meaning that they occur on classes with which the container interacts during their lifecycle (e.g. `javax.servlet.Servlet`, `javax.servlet.Filter`, ...etc.), and hence can be found by simple inspection of the class at that point.
|
||||
|
||||
Some examples of discovered annotations are:
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ Opening the `start.d/session-store-jdbc.ini` will show a list of all the configu
|
|||
----
|
||||
# ---------------------------------------
|
||||
# Module: session-store-jdbc
|
||||
# Enables JDBC peristent/distributed session storage.
|
||||
# Enables JDBC persistent/distributed session storage.
|
||||
# ---------------------------------------
|
||||
--module=session-store-jdbc
|
||||
|
||||
|
|
|
|||
|
|
@ -646,7 +646,7 @@ Modules for tag 'session':
|
|||
XML: etc/sessions/infinispan/remote.xml
|
||||
|
||||
Module: session-store-jdbc [session-store]
|
||||
: Enables JDBC peristent/distributed session storage.
|
||||
: Enables JDBC persistent/distributed session storage.
|
||||
Tags: session
|
||||
Depend: sessions, sessions/jdbc/${db-connection-type}
|
||||
XML: etc/sessions/jdbc/session-store.xml
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ Read more about SSL keystores in link:#configuring-ssl[Configuring SSL].
|
|||
Often a Connector needs to be configured to accept connections from an intermediary such as a Reverse Proxy and/or Load Balancer deployed in front of the server.
|
||||
In such environments, the TCP/IP connection terminating on the server does not originate from the client, but from the intermediary, so that the Remote IP and port number can be reported incorrectly in logs and in some circumstances the incorrect server address and port may be used.
|
||||
|
||||
Thus Intermediaries typically implement one of several de facto standards to communicate to the server information about the orginal client connection terminating on the intermediary.
|
||||
Thus Intermediaries typically implement one of several de facto standards to communicate to the server information about the original client connection terminating on the intermediary.
|
||||
Jetty supports the `X-Forwarded-For` header and the http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt[Proxy Protocol] mechanisms as described below.
|
||||
|
||||
____
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@ id::
|
|||
user::
|
||||
the name of the user
|
||||
pwd::
|
||||
the user's password (possibily obfuscated or MD5 encrypted)
|
||||
the user's password (possibly obfuscated or MD5 encrypted)
|
||||
* *user-roles* is a table containing one row for every role granted to a
|
||||
user:
|
||||
+
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ In the forthcoming Java EE-7 specification, the Web Profile reflects updates in
|
|||
|
||||
|http://jcp.org/en/jsr/detail?id=345[JSR 345] |Enterprise JavaBeans 3.2 Lite |No |
|
||||
|
||||
|http://jcp.org/en/jsr/detail?id=338[JSR 338] |Java Persistance 2.1 (JPA) |No |Yes, eg http://www.hibernate.org/[Hibernate]
|
||||
|http://jcp.org/en/jsr/detail?id=338[JSR 338] |Java Persistence 2.1 (JPA) |No |Yes, eg http://www.hibernate.org/[Hibernate]
|
||||
|
||||
|http://jcp.org/en/jsr/detail?id=250[JSR 250] |Common Annotations for the Java Platform 1.2 |Yes |Partially (for non-core Servlet Spec annotations)
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ Here is the matrix of JSRs for Java EE 6 Web Profile, and how they relate to Jet
|
|||
|
||||
|http://jcp.org/en/jsr/detail?id=318[JSR 318] |Enterprise JavaBeans 3.1 |No |Yes, OpenEJB
|
||||
|
||||
|http://jcp.org/en/jsr/detail?id=317[JSR 317] |Java Persistance 2.0 (JPA) |No |Yes, http://www.hibernate.org/[Hibernate]
|
||||
|http://jcp.org/en/jsr/detail?id=317[JSR 317] |Java Persistence 2.0 (JPA) |No |Yes, http://www.hibernate.org/[Hibernate]
|
||||
|
||||
|http://jcp.org/en/jsr/detail?id=250[JSR 250] |Common Annotations for the Java Platform |Yes |Partially (for non-core Servlet Spec annotations)
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ $ cf push snifftest --buildpack=git://github.com/jmcc0nn3ll/jetty-buildpack.git
|
|||
____
|
||||
[TIP]
|
||||
In this example the web application is uploaded from the *current* directory so make sure you have changed directory into the root of your web application.
|
||||
The `snifftest` on the commandline referrs to what you are calling the application, not the directory to deploy.
|
||||
The `snifftest` on the commandline refers to what you are calling the application, not the directory to deploy.
|
||||
Also note that the webapplication is installed into the `ROOT` context of Jetty as is available at the root context of the server.
|
||||
Any additional web applications will have to be configured within the buildpack as mentioned above.
|
||||
____
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# extra configuration arguments for the start.jar command
|
||||
# created by that script.
|
||||
#
|
||||
# Each line in this file becomes an arguement to start.jar
|
||||
# Each line in this file becomes an argument to start.jar
|
||||
# in addition to those found in the start.ini file
|
||||
# =======================================================
|
||||
jetty-started.xml
|
||||
|
|
|
|||
|
|
@ -133,7 +133,9 @@ public class HttpStatus
|
|||
NOT_MODIFIED(NOT_MODIFIED_304, "Not Modified"),
|
||||
USE_PROXY(USE_PROXY_305, "Use Proxy"),
|
||||
TEMPORARY_REDIRECT(TEMPORARY_REDIRECT_307, "Temporary Redirect"),
|
||||
// Keeping the typo for backward compatibility for a while
|
||||
PERMANET_REDIRECT(PERMANENT_REDIRECT_308, "Permanent Redirect"),
|
||||
PERMANENT_REDIRECT(PERMANENT_REDIRECT_308, "Permanent Redirect"),
|
||||
|
||||
BAD_REQUEST(BAD_REQUEST_400, "Bad Request"),
|
||||
UNAUTHORIZED(UNAUTHORIZED_401, "Unauthorized"),
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@ public class StreamResetTest extends AbstractTest
|
|||
{
|
||||
// Wait to let the data sent by the client to be queued.
|
||||
Thread.sleep(1000);
|
||||
throw new IllegalStateException("explictly_thrown_by_test");
|
||||
throw new IllegalStateException("explicitly_thrown_by_test");
|
||||
}
|
||||
catch (InterruptedException e)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ public class IOTest
|
|||
// and the server output is not shutdown
|
||||
assertFalse(server.isOutputShutdown());
|
||||
|
||||
// until we explictly shut it down
|
||||
// until we explicitly shut it down
|
||||
server.shutdownOutput();
|
||||
|
||||
// and now we can't write
|
||||
|
|
@ -168,7 +168,7 @@ public class IOTest
|
|||
// but not the other end
|
||||
assertFalse(server.isClosed());
|
||||
|
||||
// which has to be closed explictly
|
||||
// which has to be closed explicitly
|
||||
server.close();
|
||||
assertTrue(server.isClosed());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ public class ObjectMBeanUtilTest
|
|||
objectMBean.getAttribute("doodle4");
|
||||
|
||||
// then
|
||||
fail("An InvocationTargetException must have occured by now as doodle4() internally throwing exception");
|
||||
fail("An InvocationTargetException must have occurred by now as doodle4() internally throwing exception");
|
||||
}
|
||||
|
||||
private void setUpGetAttribute(String property, String value) throws Exception
|
||||
|
|
@ -148,7 +148,7 @@ public class ObjectMBeanUtilTest
|
|||
objectMBean.getAttribute("ffname");
|
||||
|
||||
// then
|
||||
fail("An AttributeNotFoundException must have occured by now as there is no " + "attribute with the name ffname in bean");
|
||||
fail("An AttributeNotFoundException must have occurred by now as there is no " + "attribute with the name ffname in bean");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -174,7 +174,7 @@ public class ObjectMBeanUtilTest
|
|||
objectMBean.getAttribute(null);
|
||||
|
||||
// then
|
||||
fail("An AttributeNotFoundException must have occured by now as there is no attribute with the name null");
|
||||
fail("An AttributeNotFoundException must have occurred by now as there is no attribute with the name null");
|
||||
}
|
||||
|
||||
@Test(expected = AttributeNotFoundException.class)
|
||||
|
|
@ -187,7 +187,7 @@ public class ObjectMBeanUtilTest
|
|||
objectMBean.setAttribute(attribute);
|
||||
|
||||
// then
|
||||
fail("An AttributeNotFoundException must have occured by now as there is no attribute " + "with the name ffname in bean");
|
||||
fail("An AttributeNotFoundException must have occurred by now as there is no attribute " + "with the name ffname in bean");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -231,7 +231,7 @@ public class ObjectMBeanUtilTest
|
|||
|
||||
// then
|
||||
assertNotNull("Address object shouldn't be null",mBeanDerivedManaged.getAttribute("aliasNames"));
|
||||
assertNull("Derived object shouldn't registerd with container so its value will be null",mBeanDerivedManaged.getAttribute("derived"));
|
||||
assertNull("Derived object shouldn't be registered with container so its value will be null",mBeanDerivedManaged.getAttribute("derived"));
|
||||
}
|
||||
|
||||
private Derived[] getArrayTypeAttribute()
|
||||
|
|
@ -292,7 +292,7 @@ public class ObjectMBeanUtilTest
|
|||
objectMBean.invoke("doodle2",new Object[] {},new String[] {});
|
||||
|
||||
// then
|
||||
fail("An MBeanException must have occured by now as doodle2() in Derived bean throwing exception");
|
||||
fail("An MBeanException must have occurred by now as doodle2() in Derived bean throwing exception");
|
||||
}
|
||||
|
||||
@Test(expected = ReflectionException.class)
|
||||
|
|
@ -305,7 +305,7 @@ public class ObjectMBeanUtilTest
|
|||
objectMBean.invoke("doodle1",new Object[] {},new String[] {});
|
||||
|
||||
// then
|
||||
fail("An ReflectionException must have occured by now as doodle1() has private access in Derived bean");
|
||||
fail("An ReflectionException must have occurred by now as doodle1() has private access in Derived bean");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -334,7 +334,7 @@ public class ObjectMBeanUtilTest
|
|||
{ "int aone" });
|
||||
|
||||
// then
|
||||
fail("An ReflectionException must have occured by now as we cannot call a methow with wrong signature");
|
||||
fail("An ReflectionException must have occurred by now as we cannot call a methow with wrong signature");
|
||||
}
|
||||
|
||||
private void setMBeanInfoForInvoke()
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ public class JettyRunDistro extends JettyRunMojo
|
|||
/**
|
||||
* Create or configure a jetty base.
|
||||
*
|
||||
* @throws Exception if any error occured while copying files
|
||||
* @throws Exception if any error occurred while copying files
|
||||
*/
|
||||
public void configureJettyBase() throws Exception
|
||||
{
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
|
|||
* is assembled into a war, saving time during the development cycle.
|
||||
* <p>
|
||||
* The plugin forks a parallel lifecycle to ensure that the "compile" phase has been completed before invoking Jetty. This means
|
||||
* that you do not need to explicity execute a "mvn compile" first. It also means that a "mvn clean jetty:run" will ensure that
|
||||
* that you do not need to explicitly execute a "mvn compile" first. It also means that a "mvn clean jetty:run" will ensure that
|
||||
* a full fresh compile is done before invoking Jetty.
|
||||
* <p>
|
||||
* Once invoked, the plugin can be configured to run continuously, scanning for changes in the project and automatically performing a
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ public class ContainerTldBundleDiscoverer implements TldBundleDiscoverer
|
|||
*
|
||||
* Support only 2 types of packaging for the bundle: - the bundle is a jar
|
||||
* (recommended for runtime.) - the bundle is a folder and contain jars in
|
||||
* the root and/or in the lib folder (nice for PDE developement situations)
|
||||
* the root and/or in the lib folder (nice for PDE development situations)
|
||||
* Unsupported: the bundle is a jar that embeds more jars.
|
||||
*
|
||||
* @param locatorHelper
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
|
|||
*
|
||||
* Support only 2 types of packaging for the bundle: - the bundle is a jar
|
||||
* (recommended for runtime.) - the bundle is a folder and contain jars in
|
||||
* the root and/or in the lib folder (nice for PDE developement situations)
|
||||
* the root and/or in the lib folder (nice for PDE development situations)
|
||||
* Unsupported: the bundle is a jar that embeds more jars.
|
||||
*
|
||||
* @return array of URLs
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ public class ServiceContextProvider extends AbstractContextProvider implements S
|
|||
|
||||
BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
|
||||
|
||||
//Start a tracker to find webapps that are osgi services that are targetted to my server name
|
||||
//Start a tracker to find webapps that are osgi services that are targeted to my server name
|
||||
_tracker = new ContextTracker (bundleContext,
|
||||
Util.createFilter(bundleContext, ContextHandler.class.getName(), getServerInstanceWrapper().getManagedServerName()));
|
||||
_tracker.open();
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser
|
|||
{
|
||||
BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
|
||||
|
||||
//Start a tracker to find webapps that are osgi services that are targetted to my server name
|
||||
//Start a tracker to find webapps that are osgi services that are targeted to my server name
|
||||
webappTracker = new WebAppTracker (bundleContext,
|
||||
Util.createFilter(bundleContext, WebAppContext.class.getName(), getServerInstanceWrapper().getManagedServerName()));
|
||||
webappTracker.open();
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import org.osgi.service.event.EventAdmin;
|
|||
import org.osgi.util.tracker.ServiceTracker;
|
||||
|
||||
/**
|
||||
* Utility class for emiting OSGi EventAdmin events
|
||||
* Utility class for emitting OSGi EventAdmin events
|
||||
*/
|
||||
public class EventSender
|
||||
{
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<Bundle-Name>Jetty OSGi Test WebApp</Bundle-Name>
|
||||
<Bundle-Activator>com.acme.osgi.Activator</Bundle-Activator>
|
||||
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
|
||||
<!-- disable the uses directive: jetty will accomodate pretty much any versions
|
||||
<!-- disable the uses directive: jetty will accommodate pretty much any versions
|
||||
of the packages it uses; no need to reflect some tight dependency determined at
|
||||
compilation time. -->
|
||||
<Export-Package>com.acme.osgi</Export-Package>
|
||||
|
|
|
|||
|
|
@ -679,7 +679,7 @@ public class PlusDescriptorProcessor extends IterativeDescriptorProcessor
|
|||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
LOG.warn("Couldn't load pre-destory target class "+className);
|
||||
LOG.warn("Couldn't load pre-destroy target class "+className);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -700,7 +700,7 @@ public class PlusDescriptorProcessor extends IterativeDescriptorProcessor
|
|||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
LOG.warn("Couldn't load pre-destory target class "+className);
|
||||
LOG.warn("Couldn't load pre-destroy target class "+className);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -717,7 +717,7 @@ public class PlusDescriptorProcessor extends IterativeDescriptorProcessor
|
|||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
LOG.warn("Couldn't load pre-destory target class "+className);
|
||||
LOG.warn("Couldn't load pre-destroy target class "+className);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -872,7 +872,7 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr
|
|||
*
|
||||
* @param path the path
|
||||
* @param methodMappings the method mappings
|
||||
* @return true if ommision exist
|
||||
* @return true if omission exist
|
||||
*/
|
||||
protected boolean omissionsExist (String path, Map<String, RoleInfo> methodMappings)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
|
||||
|
||||
[description]
|
||||
Enables JDBC peristent/distributed session storage.
|
||||
Enables JDBC persistent/distributed session storage.
|
||||
|
||||
[tags]
|
||||
session
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ import org.eclipse.jetty.util.MultiPartInputStreamParser.NonCompliance;
|
|||
|
||||
/*
|
||||
* Used to switch between the old and new implementation of MultiPart Form InputStream Parsing.
|
||||
* The new implementation is prefered will be used as default unless specified otherwise constructor.
|
||||
* The new implementation is preferred will be used as default unless specified otherwise constructor.
|
||||
*/
|
||||
public interface MultiParts extends Closeable
|
||||
{
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand
|
|||
* <p>This method can be called from {@link #handle(String, Request, HttpServletRequest, HttpServletResponse)} when an {@link DispatcherType#ERROR} dispatch
|
||||
* is detected and an error page needs to be generated by calling {@link HttpServletResponse#sendError(int, String)} with the appropriate code and reason,
|
||||
* which are taken from {@link HttpServletRequest#getAttribute(String)} for {@link RequestDispatcher#ERROR_STATUS_CODE} and {@link RequestDispatcher#ERROR_MESSAGE}
|
||||
* @see ErrorDispatchHandler for a conveniance class that calls this method.
|
||||
* @see ErrorDispatchHandler for a convenience class that calls this method.
|
||||
* @param target
|
||||
* The target of the request - either a URI or a name.
|
||||
* @param baseRequest
|
||||
|
|
|
|||
|
|
@ -1500,7 +1500,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
|
|||
|
||||
/* ------------------------------------------------------------ */
|
||||
/*
|
||||
* Set a context attribute. Attributes set via this API cannot be overriden by the ServletContext.setAttribute API. Their lifecycle spans the stop/start of
|
||||
* Set a context attribute. Attributes set via this API cannot be overridden by the ServletContext.setAttribute API. Their lifecycle spans the stop/start of
|
||||
* a context. No attribute listener events are triggered by this API.
|
||||
*
|
||||
* @see javax.servlet.ServletContext#setAttribute(java.lang.String, java.lang.Object)
|
||||
|
|
@ -3060,4 +3060,4 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
|
|||
*/
|
||||
void exitScope(Context context, Request request);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ public class HttpServerTestFixture
|
|||
if (count==0)
|
||||
{
|
||||
if (_musthavecontent)
|
||||
throw new IllegalStateException("no input recieved");
|
||||
throw new IllegalStateException("no input received");
|
||||
|
||||
writer.println("No content");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ public class BaseBuilder
|
|||
}
|
||||
else
|
||||
{
|
||||
// if (explictly added and ini file modified)
|
||||
// if (explicitly added and ini file modified)
|
||||
if (startArgs.getStartModules().contains(module.getName()))
|
||||
{
|
||||
ini=builder.get().addModule(module, startArgs.getProperties());
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ public class StartArgs
|
|||
/** List of all active [xml] sections from enabled modules */
|
||||
private List<Path> xmls = new ArrayList<>();
|
||||
|
||||
/** JVM arguments, found via commmand line and in all active [exec] sections from enabled modules */
|
||||
/** JVM arguments, found via command line and in all active [exec] sections from enabled modules */
|
||||
private List<String> jvmArgs = new ArrayList<>();
|
||||
|
||||
/** List of all xml references found directly on command line or start.ini */
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
package org.eclipse.jetty.start;
|
||||
|
||||
/**
|
||||
* A Usage Error has occured. Print the usage and exit with the appropriate exit code.
|
||||
* A Usage Error has occurred. Print the usage and exit with the appropriate exit code.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class UsageException extends RuntimeException
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ public class IO
|
|||
|
||||
/* ------------------------------------------------------------ */
|
||||
/** Delete File.
|
||||
* This delete will recursively delete directories - BE CAREFULL
|
||||
* This delete will recursively delete directories - BE CAREFUL
|
||||
* @param file The file (or directory) to be deleted.
|
||||
* @return true if anything was deleted. (note: this does not mean that all content in a directory was deleted)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ import java.util.ListIterator;
|
|||
public class LazyList
|
||||
implements Cloneable, Serializable
|
||||
{
|
||||
private static final String[] __EMTPY_STRING_ARRAY = new String[0];
|
||||
private static final String[] __EMPTY_STRING_ARRAY = new String[0];
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
private LazyList()
|
||||
|
|
@ -304,7 +304,7 @@ public class LazyList
|
|||
public static String[] toStringArray(Object list)
|
||||
{
|
||||
if (list==null)
|
||||
return __EMTPY_STRING_ARRAY;
|
||||
return __EMPTY_STRING_ARRAY;
|
||||
|
||||
if (list instanceof List)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ public class QuotedStringTokenizer
|
|||
/* ------------------------------------------------------------ */
|
||||
/** Quote a string.
|
||||
* The string is quoted only if quoting is required due to
|
||||
* embeded delimiters, quote characters or the
|
||||
* embedded delimiters, quote characters or the
|
||||
* empty string.
|
||||
* @param s The string to quote.
|
||||
* @return quoted string
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ import org.eclipse.jetty.util.log.Logger;
|
|||
/* ------------------------------------------------------------ */
|
||||
/**
|
||||
* TYPE Utilities.
|
||||
* Provides various static utiltiy methods for manipulating types and their
|
||||
* Provides various static utility methods for manipulating types and their
|
||||
* string representations.
|
||||
*
|
||||
* @since Jetty 4.1
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ public class UnixCrypt
|
|||
init_perm(PC2ROT[j], perm, 8);
|
||||
}
|
||||
|
||||
// Bit reverse, intial permupation, expantion
|
||||
// Bit reverse, initial permupation, expantion
|
||||
for (int i = 0; i < 8; i++)
|
||||
{
|
||||
for (int j = 0; j < 8; j++)
|
||||
|
|
|
|||
|
|
@ -227,8 +227,8 @@ public class ResourceTest
|
|||
String urlRef = cases.uriRef.toASCIIString();
|
||||
Data zdata = new Data("jar:"+urlRef +"TestData/test.zip!/",EXISTS,DIR);
|
||||
cases.addCase(zdata);
|
||||
cases.addCase(new Data(zdata,"Unkown",!EXISTS,!DIR));
|
||||
cases.addCase(new Data(zdata,"/Unkown/",!EXISTS,DIR));
|
||||
cases.addCase(new Data(zdata,"Unknown",!EXISTS,!DIR));
|
||||
cases.addCase(new Data(zdata,"/Unknown/",!EXISTS,DIR));
|
||||
|
||||
cases.addCase(new Data(zdata,"subdir",EXISTS,DIR));
|
||||
cases.addCase(new Data(zdata,"/subdir/",EXISTS,DIR));
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ lib/jetty-webapp-${jetty.version}.jar
|
|||
## + a package name e.g. 'net.example.'
|
||||
## + a jar file e.g. '${jetty.base.uri}/lib/dependency.jar'
|
||||
## + a directory of jars,resource or classes e.g. '${jetty.base.uri}/resources'
|
||||
## + A pattern preceeded with a '-' is an exclusion, all other patterns are inclusions
|
||||
## + A pattern preceded with a '-' is an exclusion, all other patterns are inclusions
|
||||
##
|
||||
## The +=, operator appends to a CSV list with a comma as needed.
|
||||
##
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ import org.eclipse.jetty.util.resource.Resource;
|
|||
* <li>'file:///some/location.jar' - The URI of a jar file from which
|
||||
* the class was loaded
|
||||
* <li>'jrt:/modulename' - A Java9 module name</li>
|
||||
* <li>Any of the above patterns preceeded by '-' will exclude rather than include the match.
|
||||
* <li>Any of the above patterns preceded by '-' will exclude rather than include the match.
|
||||
* </ul>
|
||||
* When class is initialized from a classpath pattern string, entries
|
||||
* in this string should be separated by ':' (semicolon) or ',' (comma).
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ public class WebInfConfiguration extends AbstractConfiguration
|
|||
}
|
||||
}
|
||||
|
||||
//if we're targetting jdk 9 or above, we also need to examine the
|
||||
//if we're targeting jdk 9 or above, we also need to examine the
|
||||
//module path
|
||||
if (targetPlatform >= 9)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public interface WebSocketConnectionListener
|
|||
/**
|
||||
* A WebSocket exception has occurred.
|
||||
* <p>
|
||||
* This is a way for the internal implementation to notify of exceptions occured during the processing of websocket.
|
||||
* This is a way for the internal implementation to notify of exceptions occurred during the processing of websocket.
|
||||
* <p>
|
||||
* Usually this occurs from bad / malformed incoming packets. (example: bad UTF8 data, frames that are too big, violations of the spec)
|
||||
* <p>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class UnitParser extends Parser
|
|||
/**
|
||||
* Parse a buffer, but do so in a quiet fashion, squelching stacktraces if encountered.
|
||||
* <p>
|
||||
* Use if you know the parse will cause an exception and just don't wnat to make the test console all noisy.
|
||||
* Use if you know the parse will cause an exception and just don't want to make the test console all noisy.
|
||||
* @param buf the buffer to parse
|
||||
*/
|
||||
public void parseQuietly(ByteBuffer buf)
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -78,7 +78,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME);
|
||||
|
|
@ -102,7 +102,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.SLOW);
|
||||
|
|
@ -127,7 +127,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -151,7 +151,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME);
|
||||
|
|
@ -175,7 +175,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.SLOW);
|
||||
|
|
@ -203,7 +203,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect.add(new TextFrame().setPayload("fragment1fragment2"));
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -231,7 +231,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -259,7 +259,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -283,7 +283,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -321,7 +321,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect2.add(new TextFrame().setPayload("f1,f2,f3,f4,f5"));
|
||||
expect2.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -354,7 +354,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -390,7 +390,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect2.add(new TextFrame().setPayload("f1,f2,f3,f4,f5"));
|
||||
expect2.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME);
|
||||
|
|
@ -432,7 +432,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect2.add(new TextFrame().setPayload("f1,f2,f3,f4,f5"));
|
||||
expect2.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.SLOW);
|
||||
|
|
@ -464,7 +464,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect.add(new TextFrame().setPayload("hello, world"));
|
||||
expect.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -489,7 +489,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect.add(new TextFrame().setPayload("hello, world"));
|
||||
expect.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME);
|
||||
|
|
@ -514,7 +514,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect.add(new TextFrame().setPayload("hello, world"));
|
||||
expect.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.SLOW);
|
||||
|
|
@ -542,7 +542,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect.add(new TextFrame().setPayload("hello, world"));
|
||||
expect.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
@ -569,7 +569,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect.add(new TextFrame().setPayload("hello, world"));
|
||||
expect.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME);
|
||||
|
|
@ -596,7 +596,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
expect.add(new TextFrame().setPayload("hello, world"));
|
||||
expect.add(new CloseInfo(StatusCode.NORMAL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.SLOW);
|
||||
|
|
@ -622,7 +622,7 @@ public class TestABCase5 extends AbstractABCase
|
|||
List<WebSocketFrame> expect = new ArrayList<>();
|
||||
expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame());
|
||||
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try(Fuzzer fuzzer = new Fuzzer(this);StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ public class TestABCase6_BadUTF extends AbstractABCase
|
|||
|
||||
try (Fuzzer fuzzer = new Fuzzer(this))
|
||||
{
|
||||
try (StacklessLogging supress = new StacklessLogging(Parser.class))
|
||||
try (StacklessLogging suppress = new StacklessLogging(Parser.class))
|
||||
{
|
||||
fuzzer.connect();
|
||||
fuzzer.setSendMode(Fuzzer.SendMode.BULK);
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ public class CaptureSocket extends WebSocketAdapter
|
|||
}
|
||||
catch (NoSuchAlgorithmException e)
|
||||
{
|
||||
messages.add("ERROR: Unable to caclulate Binary SHA1: " + e.getMessage());
|
||||
messages.add("ERROR: Unable to calculate Binary SHA1: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -662,13 +662,13 @@ public abstract class RFC2616BaseTest
|
|||
response = responses.get(0); // response 1
|
||||
assertEquals("8.1 Persistent Connections", HttpStatus.OK_200, response.getStatus());
|
||||
assertTrue("8.1 Persistent Connections",response.get("Content-Length") != null);
|
||||
assertTrue("8.1 Peristent Connections", response.getContent().contains("Resource=R1"));
|
||||
assertTrue("8.1 Persistent Connections", response.getContent().contains("Resource=R1"));
|
||||
|
||||
response = responses.get(1); // response 2
|
||||
assertEquals("8.1.2.2 Persistent Connections / Pipeline", HttpStatus.OK_200, response.getStatus());
|
||||
assertTrue("8.1.2.2 Persistent Connections / Pipeline", response.get("Content-Length") != null);
|
||||
assertEquals("8.1.2.2 Persistent Connections / Pipeline","close", response.get("Connection"));
|
||||
assertTrue("8.1.2.2 Peristent Connections / Pipeline", response.getContent().contains("Resource=R2"));
|
||||
assertTrue("8.1.2.2 Persistent Connections / Pipeline", response.getContent().contains("Resource=R2"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@ public class DefaultSessionCacheTest
|
|||
context.getSessionHandler().setSessionCache(cache);
|
||||
context.start();
|
||||
|
||||
//test remove non-existant session
|
||||
//test remove non-existent session
|
||||
Session session = cache.delete("1234");
|
||||
assertNull(session);
|
||||
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ public class ChatServlet extends HttpServlet
|
|||
LOG.debug("doPost called. join={},message={},username={}", join, message, username);
|
||||
if (username == null)
|
||||
{
|
||||
LOG.debug("no paramter user set, sending 503");
|
||||
LOG.debug("no parameter user set, sending 503");
|
||||
response.sendError(503, "user==null");
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue