Skip to content

Commit

Permalink
Merge resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
@WalkerWatch
WalkerWatch committed Feb 7, 2018
2 parents 66ddb7d + 1704360 commit 4044045
Show file tree
Hide file tree
Showing 229 changed files with 512 additions and 18 deletions.
15 changes: 15 additions & 0 deletions header-template-doc.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
========================================================================
Copyright (c) ${copyright-range} 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.
========================================================================
0 header-template.txt → header-template-java.txt
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[alpn]]
=== Introducing ALPN
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[alpn-chapter]]
== Application Layer Protocol Negotiation (ALPN)
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[annotations]]
== Annotations
Expand Down
2 changes: 2 additions & 0 deletions ...ation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[annotations-quick-setup]]
=== Quick Setup
Expand Down
2 changes: 2 additions & 0 deletions ...on/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[using-annotations-embedded]]
=== Using Annotations with Jetty Embedded
Expand Down
2 changes: 2 additions & 0 deletions ...cumentation/src/main/asciidoc/administration/annotations/using-annotations.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[using-annotations]]
=== Working with Annotations
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[balancer-servlet]]
=== Balancer Servlet
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[cgi-servlet]]
=== CGI Servlet
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[advanced-extras]]
== Provided Servlets, Filters, and Handlers
Expand Down
2 changes: 2 additions & 0 deletions ...-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[cross-origin-filter]]
=== Cross Origin Filter
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[debug-handler]]
=== Debug Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[default-handler]]
=== Default Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[default-servlet]]
=== Default Servlet
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[dos-filter]]
=== Denial of Service Filter
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[error-handler]]
=== Error Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[gzip-filter]]
=== Gzip Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[ipaccess-handler]]
=== IP Access Handler
Expand Down
2 changes: 2 additions & 0 deletions ...ocumentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[moved-context-handler]]
=== Moved Context Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[proxy-servlet]]
=== Proxy Servlet
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[qos-filter]]
=== Quality of Service Filter
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[resource-handler]]
=== Resource Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[rewrite-handler]]
=== Rewrite Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[shutdown-handler]]
=== Shutdown Handler
Expand Down
2 changes: 2 additions & 0 deletions ...y-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[statistics-handler]]
=== Statistics Handler
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[fastcgi]]
== FastCGI Support
Expand Down
2 changes: 2 additions & 0 deletions ...documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[configuring-fastcgi]]
=== Configuring Jetty for FastCGI
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[fastcgi-intro]]
=== FastCGI Introduction
Expand Down
2 changes: 2 additions & 0 deletions jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[http2]]
== HTTP/2
Expand Down
2 changes: 2 additions & 0 deletions ...y-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ========================================================================
Expand All @@ -13,6 +14,7 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

[[http2-configuring-haproxy]]
=== Configuring HAProxy and Jetty
Expand Down
Loading

0 comments on commit 4044045

Please sign in to comment.