diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc index 9113505e32d..f7328cfa3ea 100644 --- a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc index af21846b232..53ab22b7031 100644 --- a/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc index 5efaf229f26..583b9ddfddf 100644 --- a/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc index 192f1d2d3ec..59baa782981 100644 --- a/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc index 859acc3e6e4..cb665696e2c 100644 --- a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc index 32a0fcbaafe..28fa503900d 100644 --- a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc index 873d91b2b83..9e07568fcc9 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc index ac04fcaddbc..7c01cf8ec21 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc index fb5df14a5e7..ebf751375da 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc index 909706abd94..c71c68f84ac 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc index 2253819dace..b6418661f0e 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc index 1275b6ea971..11aa448bd07 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc index cae3c2142af..ab82b6c627d 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc index ca1048f5faf..78fc3199a13 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc index a893b72874c..9f167d2d2ac 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc index 72a2a4aaf50..df3b175bf27 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc new file mode 100644 index 00000000000..08bd869352c --- /dev/null +++ b/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc @@ -0,0 +1,72 @@ +// ======================================================================== +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. +// ======================================================================== +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== + +[[ipaccess-handler]] +=== IP Access Handler + +[[ipaccess-handler-metadata]] +==== Info + +* Classname: `org.eclipse.jetty.server.handler.IPAccessHandler` +* Maven Artifact: org.eclipse.jetty:jetty-server +* Javadoc: {JDURL}/org/eclipse/jetty/server/handler/IPAccessHandler.html + +[[ipaccess-handler-usage]] +==== Usage + +Controls access to the wrapped handler by the real remote IP. +Control is provided by white/black lists that include both internet addresses and URIs. +This handler uses the real internet address of the connection, not one reported in the forwarded for headers, as this cannot be as easily forged. + +Typically, the black/white lists will be used in one of three modes: + +* Blocking a few specific IPs/URLs by specifying several black list entries. +* Allowing only some specific IPs/URLs by specifying several white lists entries. +* Allowing a general range of IPs/URLs by specifying several general white list entries, that are then further refined by several specific black list exceptions. + +An empty white list is treated as match all. +If there is at least one entry in the white list, then a request *must* match a white list entry. +Black list entries are always applied, so that even if an entry matches the white list, a black list entry will override it. + +Internet addresses may be specified as absolute address or as a combination of four octet wildcard specifications (a.b.c.d) that are defined as follows. + +* nnn - an absolute value (0-255) +* mmm-nnn - an inclusive range of absolute values, with following shorthand notations: +** nnn- => nnn-255 +** -nnn => 0-nnn +** - => 0-255 +* a,b,... - a list of wildcard specifications + +Internet address specification is separated from the URI pattern using the "|" (pipe) character. +URI patterns follow the servlet specification for simple * prefix and suffix wild cards (e.g. /, /foo, /foo/bar, /foo/bar/*, *.baz). + +Earlier versions of the handler used internet address prefix wildcard specification to define a range of the internet addresses (e.g. 127., 10.10., 172.16.1.). +They also used the first "/" character of the URI pattern to separate it from the internet address. +Both of these features have been deprecated in the current version. + +Examples of the entry specifications are: + +* 10.10.1.2 - all requests from IP 10.10.1.2 +* 10.10.1.2|/foo/bar - all requests from IP 10.10.1.2 to URI /foo/bar +* 10.10.1.2|/foo/* - all requests from IP 10.10.1.2 to URIs starting with /foo/ +* 10.10.1.2|*.html - all requests from IP 10.10.1.2 to URIs ending with .html +* 10.10.0-255.0-255 - all requests from IPs within 10.10.0.0/16 subnet +* 10.10.0-.-255|/foo/bar - all requests from IPs within 10.10.0.0/16 subnet to URI /foo/bar +* 10.10.0-3,1,3,7,15|/foo/* - all requests from IPs addresses with last octet equal to 1,3,7,15 in subnet 10.10.0.0/22 to URIs starting with /foo/ + +Earlier versions of the handler used internet address prefix wildcard specification to define a range of the internet addresses (e.g. 127., 10.10., 172.16.1.). +They also used the first "/" character of the URI pattern to separate it from the internet address. +Both of these features have been deprecated in the current version. diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc index a11af28a89c..05844ca915e 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc index 07421615887..1ae74bd0874 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc index 8a7631d66ae..e35d3c0a0d3 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc index 1407ffa02a3..426ef4dcb83 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc index d9060158d61..80b45a66550 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc index 29fdb5aeb63..294df68c777 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc index 8e6dfdcebd4..4bf1186e639 100644 --- a/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc index 1c034f866e4..100c8c0648c 100644 --- a/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc b/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc index bacfa100a53..98c7eba243b 100644 --- a/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc b/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc index db2685a59e5..add23bb7429 100644 --- a/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc index 22690bcba59..b7d1dc9176b 100644 --- a/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc index 6dd48700654..0ca369740ce 100644 --- a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc index facd202d484..ed9e93e0892 100644 --- a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc index 9529172bdbb..70079b21d64 100644 --- a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc index e309b68e278..a83a756c272 100644 --- a/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc index 1ee4a06047b..77eba2ddb27 100644 --- a/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc index bb8688313a8..d1ae17bdfff 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc index e48750c3474..9cc605303bf 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc index 49f41c99b15..f37aa461bb4 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc index dd70504da8c..66a10add07d 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc index 62f8ea77128..26da2eac699 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc index 9dc0659a47a..44b69905f5d 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc index 4165b3d73a5..028eb4da0cd 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc index 35042174931..e683e898430 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc index 1472b72a9f5..24dc34962fb 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc index a5a49ed1ecf..6fe67e8363e 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc index b0f80f1a0ca..0eba18be567 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc index 4a526288949..951cefd0f26 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc index 3585f316b5d..3edc01d7db3 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc index 0627dbae94a..b867e199129 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc index f2b80851ad9..02632c3b651 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc index 04c1bb7ada1..7170783e5d8 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc index 67458c806a5..a6c8556a05d 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc index 414d9c073b2..ffb4e298f44 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc index 073dc0fc932..8aa3865dd42 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc index 17459f32147..b595dc24aa2 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc index 6afa99be69f..37d8fb26d40 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc index 32a7ece950a..6edf5122cbe 100644 --- a/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/part.adoc b/jetty-documentation/src/main/asciidoc/administration/part.adoc index 839b1c11b29..dae630b7bec 100644 --- a/jetty-documentation/src/main/asciidoc/administration/part.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/part.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc index b933efaea45..55cdd278cc7 100644 --- a/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc b/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc index c51fe23d768..c4c8c802273 100644 --- a/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc index 92a8cbde8d3..41c17c5ae07 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc index e219f41361c..489af840836 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc index 74769b9fa78..a6a998c240e 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc index 4abbd3828d3..ca0136d6275 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc index b3f5f8515a4..4a53413c08f 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc index 1da8971441c..8439fd3eba9 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc index 35b88beadaf..0fa47bd64af 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc index 4f79c24aac8..d4cc04ca083 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc index 870a07c3452..0fec3d5e037 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc index b1d726d36a4..d747dd73c89 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc index 2abc44ae276..4f07e9b14cf 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc index fcd6b25d1a3..3f1fa7faf92 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc index cabdb76adb8..02b3b46b55c 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc index 581b2878f3e..474f05b0799 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc index a06b4bee58c..67185217b20 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc index 85065daeba1..a8e3063c4ed 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc index a5ae3e9784e..8d15cfdef82 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc index 1d07231e8bd..97327d79035 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc index 5b1991edc49..36ecc246442 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc index b2a1276a6ba..ce20e7876d7 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc index f87a3c54996..8e532175e32 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc index b24a224766d..ed18cf0df6a 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc index 662b6bc0de0..15f5f894ea3 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc index 9c428f79bee..c61be2ab31b 100644 --- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc index 87f637b1949..272b94cb093 100644 --- a/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc index a5fcf49f10f..adc9458c4d5 100644 --- a/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc index 2159d433d00..6e1b88c9dad 100644 --- a/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc index e42b6e70b61..0acb75804ad 100644 --- a/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc index 9e75d96dcf3..13ad7a7cc54 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc index 18db3c60120..bdc47a4283a 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc index ed91b7e30a8..6607120ea35 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc index 8b2b4ea0f66..602a364dc6a 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc index 0eb73e9e5c1..15ba26b28eb 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc index 5201ef8b53f..20b15866414 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc index ab8482b7c8d..0c6acf7bff4 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc index ad119f43041..aa99dc3a292 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc index 094c214a274..a2df60e9fad 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc index 2ab6e7db0ee..30e3631b292 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc index 71099d0118c..4c83857dedb 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc index fec871ade47..4592ff1e96d 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc index e9c9bc1613d..1e424b55c75 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc index 18130245816..fc6b710ec99 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc index b0f50392013..e6c0b1c45bc 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc index da252d41091..1283dc58d88 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc index 5643646cdd1..ec9e98a8a25 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc index 9a6e60f9fde..7396abe19e5 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc index a6af6cbda76..dbfbef3b8b6 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc index cb3b3271c73..7e0bfc00bae 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc index edc51d8a817..3eb06f78266 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc index 4964940c83a..56d88984bff 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc b/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc index 4c508a8633f..96eaf9f70b0 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/part.adoc b/jetty-documentation/src/main/asciidoc/configuring/part.adoc index bad646e5520..9500fcdf3d6 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/part.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/part.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc index f2d0503a062..ef253f26209 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc index 46f0438a5cf..b0e4416db98 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc index f60166bb290..50f391f09ed 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc index 665dd0b2786..1d4068e51e9 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc new file mode 100644 index 00000000000..2583774b68e --- /dev/null +++ b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc @@ -0,0 +1,520 @@ +// ======================================================================== +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. +// ======================================================================== +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== + +[[jetty-home-and-jetty-base]] +=== Using the $\{jetty.home} and $\{jetty.base} Concepts to Configure +Security + +Jetty 9.1 introduced `${jetty.base}` and `${jetty.home}`. + +* `${jetty.home}` is the directory location for the jetty distribution (the binaries). +* `${jetty.base}` is the directory location for your customizations to the distribution. + +This separation: + +* Allows you to manage multiple Jetty installations. +* Makes it simple to retain your current configuration when you upgrade your Jetty distribution. + +For more information, see xref:startup-base-and-home[]. + +Further, Jetty 9.1 parameterized all of the standard configuration XMLs. +For SSL, parameters are now properties in the `start.ini` or `start.d\ssl.ini`, reducing to eliminating the need to edit XML files. + +Instead of explicitly listing all the libraries, properties, and XML files for a feature, Jetty 9.1 introduced a new module system. +A module is defined in a `modules/*.mod` file, including the libraries, dependencies, XML, and template INI files for a Jetty feature. +Thus you can use a single `--module=name` command line option as the equivalent of specifying many `--lib=location, feature.xml, name=value` arguments for a feature and all its dependencies. +Modules use their dependencies to control the ordering of libraries and XML files. +For more information, see xref:startup-modules[]. + +[[configuring-security-jetty91]] +==== Configuring SSL in with modules + +This page describes how to configure SSL in Jetty with modules. +It provides an example of using the `${jetty.home}` and `${jetty.base}` to maximum effect. +It also includes a detailed explanation of how modules work. + +This example assumes you have the jetty-distribution unpacked in `/home/user/jetty-distribution-{VERSION}`. +It also assumes you are using `start.ini` to configure your server features. + +1. Create a base directory anywhere. ++ +[source, screen, subs="{sub-order}"] +.... +[/home/user]$ mkdir my-base +[/home/user]$ cd my-base +.... +2. Add the modules for SSL, HTTP, and webapp deployment. +Adding modules in this way will append the associated module properties to the `${jetty.base}/start.ini` file. ++ +[source, screen, subs="{sub-order}"] +.... +[my-base]$ java -jar /home/user/jetty-distribution-{VERSION}/start.jar --add-to-start=http,https,deploy + +ssl initialised in ${jetty.base}/start.ini (appended) +ssl enabled in ${jetty.base}/start.ini +DOWNLOAD: https://github.com/eclipse/jetty.project/raw/master/jetty-server/src/main/config/etc/keystore to etc/keystore +server initialised in ${jetty.base}/start.ini (appended) +server enabled in ${jetty.base}/start.ini +http initialised in ${jetty.base}/start.ini (appended) +http enabled in ${jetty.base}/start.ini +server enabled in ${jetty.base}/start.ini +deploy initialised in ${jetty.base}/start.ini (appended) +deploy enabled in ${jetty.base}/start.ini +MKDIR: ${jetty.base}/webapps +server enabled in ${jetty.base}/start.ini +.... +3. Look at your directory. ++ +[source, screen, subs="{sub-order}"] +.... +[my-base]$ ls -la +total 20 +drwxrwxr-x 4 user group 4096 Oct 8 06:55 ./ +drwxr-xr-x 103 user group 4096 Oct 8 06:53 ../ +drwxrwxr-x 2 user group 4096 Oct 8 06:55 etc/ +-rw-rw-r-- 1 user group 815 Oct 8 06:55 start.ini +drwxrwxr-x 2 user group 4096 Oct 8 06:55 webapps/ +.... +4. Copy your WAR files into webapps. ++ +[source, screen, subs="{sub-order}"] +.... +[my-base]$ ls -la +[my-base]$ cp ~/code/project/target/gadget.war webapps/ +.... +5. Copy your keystore into place. ++ +[source, screen, subs="{sub-order}"] +.... +[my-base]$ cp ~/code/project/keystore etc/keystore +.... +6. Edit the `start.ini` to configure your SSL settings. ++ +[source, screen, subs="{sub-order}"] +.... +[my-base]$ cat start.ini +.... +7. Initialize module ssl. ++ +.... +--module=ssl +.... +8. Define the port to use for secure redirection. ++ +.... +jetty.secure.port=8443 +.... +9. Set up a demonstration keystore and truststore. ++ +.... +jetty.keystore=etc/keystore +jetty.truststore=etc/keystore +.... +10. Set the demonstration passwords. ++ +.... +jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g +jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +.... +11. Initialize the module server. ++ +.... +--module=server +threads.min=10 +threads.max=200 +threads.timeout=60000 +#jetty.host=myhost.com +jetty.dump.start=false +jetty.dump.stop=false +.... +12. Initialize module http. ++ +.... +--module=http +jetty.http.port=8080 +http.timeout=30000 +.... +13. Initialize module deploy. ++ +.... +--module=deploy +.... + +Look at the configuration you have at this point. + +[source, screen, subs="{sub-order}"] +.... +[my-base]$ java -jar /home/user/jetty-distribution-{VERSION}/start.jar --list-config + +Java Environment: +----------------- + java.home=/usr/lib/jvm/jdk-7u21-x64/jre + java.vm.vendor=Oracle Corporation + java.vm.version=23.21-b01 + java.vm.name=Java HotSpot(TM) 64-Bit Server VM + java.vm.info=mixed mode + java.runtime.name=Java(TM) SE Runtime Environment + java.runtime.version=1.7.0_21-b11 + java.io.tmpdir=/tmp + +Jetty Environment: +----------------- + jetty.home=/home/user/jetty-distribution-{VERSION} + jetty.base=/home/user/my-base + jetty.version={VERSION} + +JVM Arguments: +-------------- + (no jvm args specified) + +System Properties: +------------------ + jetty.base = /home/user/my-base + jetty.home = /home/user/jetty-distribution-{VERSION} + +Properties: +----------- + http.timeout = 30000 + jetty.dump.start = false + jetty.dump.stop = false + jetty.keymanager.password = OBF:1u2u1wml1z7s1z7a1wnl1u2g + jetty.keystore = etc/keystore + jetty.keystore.password = OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + jetty.http.port = 8080 + jetty.secure.port = 8443 + jetty.truststore = etc/keystore + jetty.truststore.password = OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + threads.max = 200 + threads.min = 10 + threads.timeout = 60000 + +Jetty Server Classpath: +----------------------- +Version Information on 11 entries in the classpath. +: order presented here is how they would appear on the classpath. + changes to the --module=name command line options will be reflected here. + 0: 3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar + 1: 3.1.RC0 | ${jetty.home}/lib/jetty-schemas-3.1.jar + 2: {VERSION} | ${jetty.home}/lib/jetty-http-{VERSION}.jar + 3: {VERSION} | ${jetty.home}/lib/jetty-continuation-{VERSION}.jar + 4: {VERSION} | ${jetty.home}/lib/jetty-server-{VERSION}.jar + 5: {VERSION} | ${jetty.home}/lib/jetty-xml-{VERSION}.jar + 6: {VERSION} | ${jetty.home}/lib/jetty-util-{VERSION}.jar + 7: {VERSION} | ${jetty.home}/lib/jetty-io-{VERSION}.jar + 8: {VERSION} | ${jetty.home}/lib/jetty-servlet-{VERSION}.jar + 9: {VERSION} | ${jetty.home}/lib/jetty-webapp-{VERSION}.jar +10: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar + +Jetty Active XMLs: +------------------ + ${jetty.home}/etc/jetty.xml + ${jetty.home}/etc/jetty-http.xml + ${jetty.home}/etc/jetty-ssl.xml + ${jetty.home}/etc/jetty-deploy.xml +.... + +Now start Jetty. + +[source, screen, subs="{sub-order}"] +.... +[my-base]$ java -jar /home/user/jetty-distribution-{VERSION}/start.jar +2013-10-08 07:06:55.837:INFO:oejs.Server:main: jetty-{VERSION} +2013-10-08 07:06:55.853:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/my-base/webapps/] at interval 1 +2013-10-08 07:06:55.872:INFO:oejs.ServerConnector:main: Started ServerConnector@72974691{HTTP/1.1}{0.0.0.0:8080} +.... + +[[reviewing-ssl-config]] +==== Reviewing the Configuration + +The following sections review this configuration. + +[[jetty-base-jetty-home]] +===== $\{jetty.base} and $\{jetty.home} + +First notice the separation of `${jetty.base}` and `${jetty.home}`. + +* `${jetty.home}` is where your distribution lies, unchanged, unedited. +* `${jetty.base}` is where your customizations are. + +[[modules]] +===== Modules + +Notice that you have `--module=` here and there; you have wrapped up the goal of a module (libs, configuration XMLs, and properties) into a single unit, with dependencies on other modules. + +You can see the list of modules: + +[source, screen, subs="{sub-order}"] +.... +[my-base]$ java -jar /home/user/jetty-distribution-{VERSION}/start.jar --list-modules + +Jetty All Available Modules: +---------------------------- + +Module: annotations + LIB: lib/jetty-annotations-${jetty.version}.jar + LIB: lib/annotations/*.jar + XML: etc/jetty-annotations.xml + depends: [plus] + +Module: client + LIB: lib/jetty-client-${jetty.version}.jar + depends: [] + +Module: debug + XML: etc/jetty-debug.xml + depends: [server] + +Module: deploy + LIB: lib/jetty-deploy-${jetty.version}.jar + XML: etc/jetty-deploy.xml + depends: [webapp] + enabled: ${jetty.base}/start.ini + +Module: ext + LIB: lib/ext/*.jar + depends: [] + +Module: http + XML: etc/jetty-http.xml + depends: [server] + enabled: ${jetty.base}/start.ini + +Module: http2 + LIB: lib/http2/*.jar + XML: etc/jetty-http2.xml + depends: [ssl, alpn] + +Module: http2c + LIB: lib/http2/*.jar + XML: etc/jetty-http2c.xml + depends: [http] + +Module: https + XML: etc/jetty-https.xml + depends: [ssl] + +Module: ipaccess + XML: etc/jetty-ipaccess.xml + depends: [server] + +Module: jaas + LIB: lib/jetty-jaas-${jetty.version}.jar + XML: etc/jetty-jaas.xml + depends: [server] + +Module: jaspi + LIB: lib/jetty-jaspi-${jetty.version}.jar + LIB: lib/jaspi/*.jar + depends: [security] + +Module: jmx + LIB: lib/jetty-jmx-${jetty.version}.jar + XML: etc/jetty-jmx.xml + depends: [] + +Module: jndi + LIB: lib/jetty-jndi-${jetty.version}.jar + LIB: lib/jndi/*.jar + depends: [server] + +Module: jsp + LIB: lib/jsp/*.jar + depends: [servlet] + +Module: jvm + depends: [] + +Module: logging + XML: etc/jetty-logging.xml + depends: [] + +Module: lowresources + XML: etc/jetty-lowresources.xml + depends: [server] + +Module: monitor + LIB: lib/jetty-monitor-${jetty.version}.jar + XML: etc/jetty-monitor.xml + depends: [client, server] + +Module: npn + depends: [] + +Module: plus + LIB: lib/jetty-plus-${jetty.version}.jar + XML: etc/jetty-plus.xml + depends: [server, security, jndi] + +Module: proxy + LIB: lib/jetty-proxy-${jetty.version}.jar + XML: etc/jetty-proxy.xml + depends: [client, server] + +Module: requestlog + XML: etc/jetty-requestlog.xml + depends: [server] + +Module: resources + LIB: resources + depends: [] + +Module: rewrite + LIB: lib/jetty-rewrite-${jetty.version}.jar + XML: etc/jetty-rewrite.xml + depends: [server] + +Module: security + LIB: lib/jetty-security-${jetty.version}.jar + depends: [server] + +Module: server + LIB: lib/servlet-api-3.1.jar + LIB: lib/jetty-schemas-3.1.jar + LIB: lib/jetty-http-${jetty.version}.jar + LIB: lib/jetty-continuation-${jetty.version}.jar + LIB: lib/jetty-server-${jetty.version}.jar + LIB: lib/jetty-xml-${jetty.version}.jar + LIB: lib/jetty-util-${jetty.version}.jar + LIB: lib/jetty-io-${jetty.version}.jar + XML: etc/jetty.xml + depends: [] + enabled: ${jetty.base}/start.ini + +Module: servlet + LIB: lib/jetty-servlet-${jetty.version}.jar + depends: [server] + +Module: servlets + LIB: lib/jetty-servlets-${jetty.version}.jar + depends: [servlet] + +Module: setuid + LIB: lib/setuid/jetty-setuid-java-1.0.1.jar + XML: etc/jetty-setuid.xml + depends: [server] + +Module: ssl + XML: etc/jetty-ssl.xml + depends: [server] + enabled: ${jetty.base}/start.ini + +Module: stats + XML: etc/jetty-stats.xml + depends: [server] + +Module: webapp + LIB: lib/jetty-webapp-${jetty.version}.jar + depends: [servlet] + +Module: websocket + LIB: lib/websocket/*.jar + depends: [annotations] + +Module: xinetd + XML: etc/jetty-xinetd.xml + depends: [server] + +Jetty Active Module Tree: +------------------------- + + Module: server [enabled] + + Module: http [enabled] + + Module: servlet [transitive] + + Module: ssl [enabled] + + Module: webapp [transitive] + + Module: deploy [enabled] +.... + +These are the modules by name, the libraries they bring in, the XML configurations they use, the other modules they depend on (even optional ones), and if the module is in use, where it was enabled. + +While you can manage the list of active modules yourself, it is much easier to edit the `${jetty.base}/start.ini`. + +If you want to start using a new module: + +[source, screen, subs="{sub-order}"] +.... +[my-base] $ java -jar ../jetty-distribution-{VERSION}/start.jar --add-to-start=https +.... + +This adds the `--module=` lines and associated properties (the parameterized values mentioned above), to your `start.ini`. + +____ +[IMPORTANT] +Do not edit the modules and XML files in the `${jetty.home}` directory; there is no need to be moving or copying them unless you want to make your own modules or override the behavior of an existing module. +____ + +Notice that your `${jetty.base}/start.ini` has no references to the XML files. +That's because the module system and its graph of dependencies now dictate all of the XML files, and their load order. + +[[parameterizing]] +===== Parameters + +Next is parameterizing all of the standard configuration XMLs. +In this example all of the SSL parameters are now just properties in the `start.ini`, reducing or eliminating the need to edit XML files. + +[[override-jetty.home]] +===== Overriding $\{jetty.home} in $\{jetty.base} + +Finally, you can override anything you see in `${jetty.home}` in `${jetty.base}`, even XML configurations and libraries. + +For more information on the `start.jar` in 9.1, see xref:start-jar[]. + +[[summary-configuring-SSL-Jetty]] +==== Summary of Configuring SSL + +1. Download and unpack Jetty into `/home/user/jetty-distribution-{VERSION}`. +2. Go to your base directory and just use the distribution, no editing. ++ +[source, screen, subs="{sub-order}"] +.... +[my-base]$ java -jar /home/user/jetty-distribution-{VERSION}/start.jar +.... +* The Jetty distribution provides, out of the box, the XML configuration files, in this case `jetty-http.xml` and `jetty-ssl.xml`. +These can be found in the `${jetty.home}/etc/` directory. +* We have parameterized all of the configurable values in those XMLs. +You can now set the values using simple properties, either on the command line, or within the `${jetty.base}/start.ini`. +* When you activate the module for HTTP or HTTPs, Jetty automatically adds the appropriate libraries and XML to start Jetty. +Unless you have a highly custom setup (such as listening on two different ports, using SSL on each, each with its own keystore and configuration), there is no need to muck around in XML files. +3. Use modules to configure HTTPS: +* http -> server +* https -> ssl -> server ++ +You can find the details about the modules in `${jetty.home}/modules/`. +For SSL they include `modules/http.mod`, `modules/https.mod`, `modules/ssl.mod`, and `modules/server.mod`. ++ +Ideally, this level of detail is not important to you. +What is important is that you want to use HTTPS and want to configure it. +You accomplish that by adding the `--module=https` to your `start.ini`. +By default, the module system keeps things sane, and transitively includes all dependent modules as well. + +You can see what the configuration looks like, after all of the modules are resolved, without starting Jetty via: + +[source, screen, subs="{sub-order}"] +.... +[my-base] $ java -jar ../jetty-distribution-{VERSION}/start.jar --list-config +.... + +Just because the JARs exist on disk does not mean that they are in use. +The configuration controls what is used. + +Use the `--list-config` to see the configuration. +Notice that only a subset of the JARs from the distribution are in use. +The modules you have enabled determine that subset. + +[source, screen, subs="{sub-order}"] +.... +[my-base]$ java -jar ~/jetty-distribution-{VERSION}/start.jar --list-config +.... diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc index dbeb7f00f43..3cbc489785a 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc index 3fb6e507d7c..5c5587362cb 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc index 04379f2fdb9..df0a6c4ccee 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc index 73f87818a58..b867dd1bda0 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc index 55261243c14..9b900bb913f 100644 --- a/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc b/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc index c75ec77a14c..f695f785600 100644 --- a/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc +++ b/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc index 048119e93f3..c081ef31676 100644 --- a/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc index 8ea908d95c7..155e03a87e5 100644 --- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc +++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc index 1bd97e9d467..505cb83a303 100644 --- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc +++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc index 9aa7d8839f2..34886a8bb08 100644 --- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc +++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc index 23e1d50a049..03dd51a8cc9 100644 --- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc +++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc index 3f3335ba5cd..45b3b2349af 100644 --- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc +++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc index 9b2112dd93d..10cc6cd65e6 100644 --- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc +++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc index 32ecf816a0a..969c3ff1ad7 100644 --- a/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc index 8e14840cf3f..f6e901e4fdb 100644 --- a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc +++ b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc index 48b3b00d2b2..f0924fa0d3d 100644 --- a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc +++ b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc index 48009c3bf48..4641e7eecef 100644 --- a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc +++ b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc index 287bb604b19..b1fe3331e08 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc index 6ae14dab518..db0b6590761 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc index c87179980a9..11010c1395c 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc index 0ab2e0a1c63..06ee5b3190d 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc index 579b2a0a55b..4f581e9a56a 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc index 3b7ae42b2bf..a398bff58d7 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc index 28259bf5f38..d2fe0fda763 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc index 1a4ec85821b..837e84580a4 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc index aa64ad62fa8..5f8eda2aa56 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc index 83e07de0ad8..7e10fb571b6 100644 --- a/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc +++ b/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc index e30caa1ec1e..2bae0934911 100644 --- a/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc index f24efc350ee..5436e186542 100644 --- a/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc +++ b/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc index 7d6f5cd97e4..cf32d92fd7a 100644 --- a/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc +++ b/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc index d0fadfd2cba..c389d46bf23 100644 --- a/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc +++ b/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc index 1211e967aa9..9d3718fb651 100644 --- a/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc +++ b/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc index 4f03f30e5c8..7dfc818e17a 100644 --- a/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc b/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc index c5238666e60..49f53249999 100644 --- a/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc +++ b/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc index beda6d1d370..d56efdbe321 100644 --- a/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc index 07c2df8388b..623bf23e3db 100644 --- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc +++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc index c6f2ccebb50..34f1c7ec01b 100644 --- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc +++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc index 698be4234e2..31a1d71cf57 100644 --- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc +++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. and others +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 @@ -504,7 +504,7 @@ Here's how to set it: ==== jetty:run-exploded The run-exploded goal first assembles your webapp into an exploded WAR file and then deploys it to Jetty. -If you set a non-zero `scanInterval`, Jetty watches your `pom.xml`, `WEB-INF/lib`, `WEB-INF/` and `WEB-INF/web.xml` for changes and redeploys when necessary. +If you set a non-zero `scanInterval`, Jetty watches your `pom.xml,`WEB-INF/lib`, `WEB-INF/` and `WEB-INF/web.xml` for changes and redeploys when necessary. [[configuring-exploded-war]] ===== Configuration @@ -523,7 +523,7 @@ Here's how to set it: ... org.eclipse.jetty - jetty-maven-plugin + maven-jetty-plugin {VERSION} ${project.basedir}/target/myfunkywebapp @@ -544,10 +544,9 @@ Unlike `run-war`, the phase in which this plugin executes is not bound to the "p war:: The location of the WAR file. This defaults to `${project.build.directory}/${project.build.finalName}`, but you can override the default by setting this parameter. daemon:: -If true (the default), this plugin will start Jetty but let the build continue. +If true, this plugin will start Jetty but let the build continue. This is useful if you want to start jetty as an execution binding in a particular phase and then stop it in another. -Alternatively, you can set this parameter to false, in which case Jetty will block and you will need to use a ctrl-c to stop it. The parameter can also be set -using the property `jetty.daemon`. +Alternatively, you can set this parameter to false, in which case Jetty will block and you will need to use a ctrl-c to stop it. Here's the configuration: diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc index f81e3003fb4..dc31128074f 100644 --- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc +++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/part.adoc b/jetty-documentation/src/main/asciidoc/development/part.adoc index df19af46272..6ec17073d11 100644 --- a/jetty-documentation/src/main/asciidoc/development/part.adoc +++ b/jetty-documentation/src/main/asciidoc/development/part.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc index 343eae51aa3..a6d844887f3 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc index d551ff13914..fa021efa1d6 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc index b37d4ab3a0d..89e15ccafc9 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc index 418c9411fca..2e932d078f4 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc index a93e154f7ae..1265e027454 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc index 50e93fddff7..ec29d81948d 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc index c81175e5029..73b00751c4b 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc index 7565ba26106..ecce0322b67 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc index dc226435552..953846d0e0b 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc index 49afbe47204..7dc4d9ee4ec 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc index 754e0044c0e..0ead9602451 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc index 723e1461e64..f01ff02ddb7 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc index 8bc44335001..46a5e0a7726 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc index 24c80b94f8e..e8b16bf61e9 100644 --- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc +++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/index.adoc b/jetty-documentation/src/main/asciidoc/index.adoc index 5356fac986b..4b5846b4d38 100644 --- a/jetty-documentation/src/main/asciidoc/index.adoc +++ b/jetty-documentation/src/main/asciidoc/index.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc b/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc index 7379a704ea4..4260bca3497 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc b/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc index 24601df0401..1e93096eb5d 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc b/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc index 8864483cb4b..54681b06d19 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc index 1a6d5f096d7..8f9c022de70 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc index def928e5061..7493d3a54eb 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc index 3c2a828df91..dbea7fb51a0 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc index f2cad982e6e..6097efb0299 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc index 20fc03b5be6..4e3ef6c87b4 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc index 8350bf18633..c0efb18cff7 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc index 6e2866d479a..673f7e1f1d3 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc index 241665faacd..68a5ec6a173 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc index 4f9c9478176..14975a46fb2 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/quick-start/part.adoc b/jetty-documentation/src/main/asciidoc/quick-start/part.adoc index 2c87e4a8a85..7e3e18afaed 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/part.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/part.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc index 3df54150956..9af3d946bfc 100644 --- a/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc index 04c69203b29..47f10540c51 100644 --- a/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc index ac74770bc04..8f88288671d 100644 --- a/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc index ff87281b448..8aaf913d5e4 100644 --- a/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc index 6918bed3d03..247f99ca43d 100644 --- a/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc index 88b52fb1d32..44e748aba75 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc index cc19329a40b..c805c8eaca8 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc index 58bba75d9dd..1bba348150e 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc index 5488b4d512f..b1a47d807ad 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc index 0c0d871aa48..38a1723b165 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 @@ -17,8 +17,8 @@ [[contributing-documentation]] === Documentation -This document is produced using a combination of maven, git, and asciidoc. -We welcome anyone and everyone to contribute to the content of this book. +This document is produced using a combination of maven, git, and asciidoc. +We welcome anyone and everyone to contribute to the content of this book. Below is the information on how to obtain the source of this book and to build it as well as information on how to contribute back to it. Note: All contributions to this documentation are under the EPLv1 and the copyright is assigned to Mort Bay. @@ -30,7 +30,7 @@ You will need: git:: This documentation is part of the Jetty project so all contributions must be through the normal Jetty contribution process. + -You can go one of two ways for using git, if you are familiar with SCM's and the command line interface feel free to install and use git from there. +You can go one of two ways for using git, if you are familiar with SCM's and the command line interface feel free to install and use git from there. Otherwise we would recommend you use the github client itself as it will help with some of the workflow involved with working with git. All contributions much be signed and can be pulled into Jetty through the normal pull request process. @@ -39,7 +39,7 @@ maven 3:: ==== Render Chain -The Jetty documentation is all written in asciidoc which is used as the origin format. +The Jetty documentation is all written in asciidoc which is used as the origin format. The maven build uses the asciidoctor-maven-plugin to process all of the .adoc files into a single docbook file which is then used to produce the final output. We use this intermediary step in order to primarily produce chunked html which we then deploy to the Eclipse Jetty website. However we can also use this docbook output to produce pdf files, epub books or even Eclipse Help files should we so desire. @@ -60,14 +60,14 @@ Now we move on to building it. [source, screen, subs="{sub-order}"] .... -$ cd jetty.project/jetty-documentation +$ cd jetty.project/jetty-documentation $ mvn install .... -While maven is running you may see a lot of files being downloaded. +While maven is running you may see a lot of files being downloaded. If you are not familiar with maven, then what you are seeing is maven setting up the execution environment for generating the documentation. This build will first produce docbook xml and then through the docbkx-maven-plugin generate the chunked html output. -The downloads are all of the java dependencies that are required to make this build work. +The downloads are all of the java dependencies that are required to make this build work. After a while the downloading will stop and you should see the execution of the asciidoctor-maven-plugin followed by the docbkx-maven-plugin. [source, screen, subs="{sub-order}"] @@ -92,10 +92,10 @@ The build is finished once you see a message akin to this: [INFO] Total time: 7.014s [INFO] Finished at: Tue Oct 25 14:15:37 CDT 2011 [INFO] Final Memory: 14M/229M -[INFO] ------------------------------------------------------------------------ +[INFO] ------------------------------------------------------------------------ .... -You may now open your web browser and browse to the first page of the html output to see what you have produced! +You may now open your web browser and browse to the first page of the html output to see what you have produced! Generally you can do this with File -> Open File -> which will open a file system browsing screen, navigate to your jetty-documentation directory and then further into target/docbkx/html/index/index.html which is the first page of the produced documentation. ____ @@ -105,28 +105,28 @@ ____ ==== Making Changes -Now that you have built the documentation, you want to edit it and make some changes. -We'll now have to take a bit of as step back and look at how git and github works. -In the above example you have cloned directly from our canonical documentation repository. -Obviously we can not allow anyone immediate access to this repository so you must make a fork of it for your own and then issue back pull requests to build up documentation karma. +Now that you have built the documentation, you want to edit it and make some changes. +We'll now have to take a bit of as step back and look at how git and github works. +In the above example you have cloned directly from our canonical documentation repository. +Obviously we can not allow anyone immediate access to this repository so you must make a fork of it for your own and then issue back pull requests to build up documentation karma. In English that means that you would go to the url of the documentation in github: .... https://github.com/eclipse/jetty.project .... -When you are on this page you will see a little button called 'Fork' which you can click and you will be taken back to your main page on github where you have a new repository. -When you checkout this repository you are free to commit to your heart's delight all the changes you so direly wish to see in the Jetty documentation. -You can clone it to your local machine and build it the same way as above. -So let's start small with a little example. -Find some paragraph in the documentation that you think needs changed. Locate that in the local checkout and make the change. -Now follow the process to push that change back into Jetty proper. +When you are on this page you will see a little button called 'Fork' which you can click and you will be taken back to your main page on github where you have a new repository. +When you checkout this repository you are free to commit to your heart's delight all the changes you so direly wish to see in the Jetty documentation. +You can clone it to your local machine and build it the same way as above. +So let's start small with a little example. +Find some paragraph in the documentation that you think needs changed. Locate that in the local checkout and make the change. +Now follow the process to push that change back into Jetty proper. Do make sure the change works and the build isn't broken though so make sure you run maven and check the output. Then commit the change. [source, screen, subs="{sub-order}"] .... -$ git commit -s -m "Tweaked the introduction to fix a horrid misspelled word." src/main/asciidoc/quickstart/introduction/topic.xml +$ git commit -s -m "Tweaked the introduction to fix a horrid misspelled word." src/main/asciidoc/quickstart/introduction/topic.xml .... ____ @@ -135,7 +135,7 @@ In order for us to accept your commit into the Jetty repository you must have an Please check out the link:#contributing-cla[patches] section for more information. ____ -This will commit the change in your local repository. +This will commit the change in your local repository. You can then push the change up to your repository on github. [source, screen, subs="{sub-order}"] @@ -143,18 +143,18 @@ You can then push the change up to your repository on github. $ git push .... -Now you'll see some output showing that your change has been propagated to your repository on github. -In fact if you navigate to that repository at the top of the files list you should see your comment there. -Success, your change is now positioned for notifying us about it! -If you click on the commit message itself you'll be taken to a screen that shows what files were changed in that commit. In the upper right corner is a button for 'Pull Request'. +Now you'll see some output showing that your change has been propagated to your repository on github. +In fact if you navigate to that repository at the top of the files list you should see your comment there. +Success, your change is now positioned for notifying us about it! +If you click on the commit message itself you'll be taken to a screen that shows what files were changed in that commit. In the upper right corner is a button for 'Pull Request'. When you select this and follow the workflow we will then be notified of your contribution and will be able to apply it to our git repository upon review. -Thats it! You have successfully contributed to the documentation efforts of the Jetty project. +Thats it! You have successfully contributed to the documentation efforts of the Jetty project. After enough of these sorts of contributions and building up good community karma, you may be asked to join us as a committer on the documentation. ==== Conventions -Below is list of conventions that should be followed when developing documentation within this framework. +Below is list of conventions that should be followed when developing documentation within this framework. These are not set in stone and should be updated as we learn more. ventilated prose:: @@ -165,13 +165,13 @@ ventilated prose:: Enabling Soft Line Wrap in your favorite editor can make this a bit easier to stomach. id's:: - Critically important for being able to generate url's that can be used in a persistent fashion. + Critically important for being able to generate url's that can be used in a persistent fashion. Without sane id's the chapters and sections will have generated id which are rooted in some obscure location based - voodoo. - A url using these 'e12c8673' type links will not be durable across generations of the documentation. + voodoo. + A url using these 'e12c8673' type links will not be durable across generations of the documentation. These id's need to be used on chapters and sections two deep, and anywhere that you intend to cross link deeper. + -The id values go into a global namespace so they must be unique across the entire document or the last example will win and any cross links will go there. +The id values go into a global namespace so they must be unique across the entire document or the last example will win and any cross links will go there. Below is an example of an id. .... @@ -184,13 +184,13 @@ link vs xref:: version differences:: In general differences in functionality within a release should go into nested sections and use titles like 'Prior to: ##' or 'In version: ##'. - + license blocks:: - Each adoc file should contain the license block that exists in the index.adoc file and a copy has been added to the bottom of this page as well for reference. + Each adoc file should contain the license block that exists in the index.adoc file and a copy has been added to the bottom of this page as well for reference. .... // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 @@ -236,5 +236,4 @@ ________________________________________________________________________________ ==== Oddities -* If an included file ends with a list entry, it needs to have two empty lines at the end of the file in order for the section rendering to work correctly. - +* If an included file ends with a list entry, it needs to have two empty lines at the end of the file in order for the section rendering to work correctly. diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc index 2d765b827f4..3e9e16f115d 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc index f08685781f4..c3a6f3bea83 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc index 07db7b8657b..b56b8495c97 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc index a786460e2c9..46a8e798043 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc index 81ddb84d787..78abc7bc9a2 100644 --- a/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc index 4a9e58ccf1f..6d295327d4f 100644 --- a/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc index 785b6899463..b46596ed71a 100644 --- a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc index cb665358195..98b1ddb458e 100644 --- a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc index c151368f0be..0d18f16c38f 100644 --- a/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc index 2d9768fb225..a746da38c4b 100644 --- a/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc index 7b8bfadd2cd..63347283e06 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc index ccbb0c171b2..078a55d9f10 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc index 72f370e33d7..5f481cae416 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc index d9e0747851e..d69650899fa 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc index 0c465cba05f..10a4771732a 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc index 5e661c2f8b4..ead3c27f1ea 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc index dc4b75f8cc1..006826a14ad 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc index 5c99225b09c..5d64fbaec35 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/part.adoc b/jetty-documentation/src/main/asciidoc/reference/part.adoc index bbf42572adf..45a31c2cf51 100644 --- a/jetty-documentation/src/main/asciidoc/reference/part.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/part.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc index 44a5dc5b2cd..cf99877ce9f 100644 --- a/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc index 767e7af3665..e24386b0616 100644 --- a/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc index 07b9f4d8286..f1e36ffcf17 100644 --- a/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc index e194c69b199..ba8e4a91557 100644 --- a/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc index 2b43c4b3c50..5155f05ac89 100644 --- a/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc index 413b2439087..fbada6592fc 100644 --- a/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc index 73538a76fb1..ffa7b8c02ff 100644 --- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc index eca61ffd80a..f5c1525bd42 100644 --- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc index 39d340c751d..7bb7aea913d 100644 --- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc index e3b4009b93f..8ba0c2e454a 100644 --- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc index 495f29a18cf..088509c2f02 100644 --- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc index 93006bc25bf..5ed71b4feb3 100644 --- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc index cf37519172f..007688fd259 100644 --- a/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. // ======================================================================== // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc new file mode 100644 index 00000000000..ede33a961fa --- /dev/null +++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc @@ -0,0 +1,23 @@ +// ======================================================================== +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. +// ======================================================================== +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== + += Sample Title + +This is a sample paragraph. + +== Sample Subsection + +More sample text. diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java index f39b925d9ae..7cb2e6771af 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java @@ -428,5 +428,11 @@ public class HttpChannelOverHTTP2 extends HttpChannel implements Closeable, Writ callback.failed(x); } } + + @Override + public String toString() + { + return String.format("%s@%x[%s]", getClass().getName(), hashCode(), failure); + } } }