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

Merge

This commit is contained in:
Chris Walker 2019-07-22 14:43:32 -04:00
parent 8d4f9b8fd1 e1f2073e8d
commit 228da21a9b
No known key found for this signature in database
GPG Key ID: 422B41E6AAA5A72C
6 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-documentation/src/main/asciidoc/contribution-guide/4-documentation.adoc
View File

@ -142,6 +142,14 @@ This is a test to link to link:{DISTGUIDE}[Distribution Guide]
This is a test to deep link to link:{DISTGUIDE}#startup[Distribution Guide Deep Link]
images::
Images are placed in the `/images*` directory of the guide they should appear in and then referenced with a `image:` tag.
....
image:small_powered_by.gif
....
image:small_powered_by.gif
version differences::
In general differences in functionality within a release should go into nested sections and use titles like 'Prior to: ##' or 'In version: ##'.

BIN
jetty-documentation/src/main/asciidoc/contribution-guide/images/small_powered_by.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

3
jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc
View File

@ -23,10 +23,9 @@
:revdate: {TIMESTAMP}
:toc: left
:toc-title: Contribution Guide
:toc-image: jetty-logo.svg
:toc-image: ../common/images/jetty-logo.svg
:toc-image-url: /jetty/index.html
:imagesdir: ../common/images
// docinfo lets you pull in shared content and/or influence via render type
//:docinfodir: {DOCINFODIR}/documentation

6
jetty-documentation/src/main/asciidoc/distribution-guide/deploying/deployment-architecture.adoc
View File

@ -27,7 +27,7 @@ The Jetty distribution contains example `DeploymentManager` configurations to de
The `DeploymentManager` is the heart of the typical webapp deployment mechanism; it operates as a combination of an Application LifeCycle Graph, Application Providers that find and provide Applications into the Application LifeCycle Graph, and a set of bindings in the graph that control the deployment process.
image:images/Jetty_DeployManager_DeploymentManager_Roles.png[image,width=195]
image:Jetty_DeployManager_DeploymentManager_Roles.png[image,width=195]
[[udm-application-providers]]
==== Application Providers
@ -40,7 +40,7 @@ The main `AppProvider` with the Jetty distribution is the link:{JDURL}/org/eclip
The core feature of the `DeploymentManager` is the link:{JDURL}/org/eclipse/jetty/deploy/AppLifeCycle.html[Application LifeCycle Graph].
image:images/Jetty_DeployManager_AppLifeCycle-1.png[image,width=340]
image:Jetty_DeployManager_AppLifeCycle-1.png[image,width=340]
The nodes and edges of this graph are pre-defined in Jetty along the most common actions and states found.
These nodes and edges are not hardcoded; they can be adjusted and added to depending on need (for example, any complex requirements for added workflow, approvals, staging, distribution, coordinated deploys for a cluster or cloud, etc.).
@ -68,7 +68,7 @@ There are four default bindings:
* link:{JDURL}/org/eclipse/jetty/deploy/bindings/StandardStopper.html[`StandardStopper`] — Stops the ContextHandler and stops accepting incoming requests.
* link:{JDURL}/org/eclipse/jetty/deploy/bindings/StandardUndeployer.html[`StandardUndeployer`] — Removes the ContextHandler from Jetty.
image:images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png[image,width=851]
image:Jetty_DeployManager_DefaultAppLifeCycleBindings.png[image,width=851]
A fifth, non-standard binding, called link:{JDURL}/org/eclipse/jetty/deploy/bindings/DebugBinding.html[DebugBinding], is also available for debugging reasons; it logs the various transitions through the Application LifeCycle.

37
jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc
View File

@ -23,10 +23,9 @@
:revdate: {TIMESTAMP}
:toc: left
:toc-title: Administration Guide
:toc-image: jetty-logo.svg
:toc-image: ../common/images/jetty-logo.svg
:toc-image-url: /jetty/index.html
:imagesdir: ../common/images
// docinfo lets you pull in shared content and/or influence via render type
//:docinfodir: {DOCINFODIR}/documentation
@ -61,20 +60,20 @@ endif::[]
include::startup/chapter.adoc[]
include::sessions/chapter.adoc[]
include::logging/chapter.adoc[]
include::jndi/chapter.adoc[]
include::annotations/chapter.adoc[]
include::jmx/chapter.adoc[]
include::alpn/chapter.adoc[]
include::http2/chapter.adoc[]
include::fastcgi/chapter.adoc[]
include::extras/chapter.adoc[]
include::runner/chapter.adoc[]
include::tuning/chapter.adoc[]
include::deploying/chapter.adoc[]
include::contexts/chapter.adoc[]
include::connectors/chapter.adoc[]
include::security/chapter.adoc[]
include::jsp/chapter.adoc[]
include::administration/startup/chapter.adoc[]
include::administration/sessions/chapter.adoc[]
include::administration/logging/chapter.adoc[]
include::administration/jndi/chapter.adoc[]
include::administration/annotations/chapter.adoc[]
include::administration/jmx/chapter.adoc[]
include::administration/alpn/chapter.adoc[]
include::administration/http2/chapter.adoc[]
include::administration/fastcgi/chapter.adoc[]
include::administration/extras/chapter.adoc[]
include::administration/runner/chapter.adoc[]
include::administration/tuning/chapter.adoc[]
include::configuring/deploying/chapter.adoc[]
include::configuring/contexts/chapter.adoc[]
include::configuring/connectors/chapter.adoc[]
include::configuring/security/chapter.adoc[]
include::configuring/jsp/chapter.adoc[]

4
jetty-documentation/src/main/asciidoc/quickstart-guide/index.adoc
View File

@ -23,11 +23,9 @@
:revdate: {TIMESTAMP}
:toc: left
:toc-title: Quickstart Guide
:toc-image: jetty-logo.svg
:toc-image: ../common/images/jetty-logo.svg
:toc-image-url: /jetty/index.html
:imagesdir: ../common/images
// docinfo lets you pull in shared content and/or influence via render type
//:docinfodir: {DOCINFODIR}/documentation
//:docinfo1: