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

Merge branch 'jetty-9.4.x'

This commit is contained in:
WalkerWatch 2017-11-09 13:46:53 -05:00
parent e7f6969059 7ba4428e9f
commit 80725581e2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc
View File

@ -179,7 +179,7 @@ This is especially important when binding the RMI server host to the loopback ad
===== Enabling JMX Remote Access in Standalone Jetty Server ===== Enabling JMX Remote Access in Standalone Jetty Server
Similarly to <<jmx-standalone-jetty,enabling JMX in a standalone Jetty server>>, you enable the `jmx-remote` module: Similarly to link:#jmx-standalone-jetty[enabling JMX in a standalone Jetty server], you enable the `jmx-remote` module:
[source, screen, subs="{sub-order}"] [source, screen, subs="{sub-order}"]
---- ----
@ -350,7 +350,7 @@ Then you setup the local port forwarding with the SSH tunnel:
$ ssh -L 1099:localhost:1099 <user>@<machine_host> $ ssh -L 1099:localhost:1099 <user>@<machine_host>
---- ----
Now you can use JConsole or JMC to connect to `localhost:1099` on your local computer. Now you can use JConsole or JMC to connect to `localhost:1099` on your local computer.
The traffic will be forwarded to `machine_host` and when there, SSH will forward the traffic to `localhost:1099`, which is exactly where the `ConnectorServer` listens. The traffic will be forwarded to `machine_host` and when there, SSH will forward the traffic to `localhost:1099`, which is exactly where the `ConnectorServer` listens.
When you configure `ConnectorServer` in this way, you must set the system property `-Djava.rmi.server.hostname=localhost`, on the server. When you configure `ConnectorServer` in this way, you must set the system property `-Djava.rmi.server.hostname=localhost`, on the server.

2
jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc
View File

@ -103,7 +103,7 @@ Instructs `start.jar` to use each line of the specified file as arguments on the
Enables debugging output of the startup procedure. Enables debugging output of the startup procedure.
+ +
*Note*: This does not set up debug logging for Jetty itself. *Note*: This does not set up debug logging for Jetty itself.
For information on logging, please see the section on <<configuring-jetty-logging, Configuring Jetty Logging.>> For information on logging, please see the section on link:#configuring-jetty-logging[Configuring Jetty Logging.]]
--start-log-file=<filename>:: --start-log-file=<filename>::
Sends all startup output to the filename specified. Sends all startup output to the filename specified.
Filename is relative to `${jetty.base}`. Filename is relative to `${jetty.base}`.

2
jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc
View File

@ -59,7 +59,7 @@ Modules::
Modules also use their dependencies to control the ordering of libraries and XML files. Modules also use their dependencies to control the ordering of libraries and XML files.
There are several module files included with the Jetty distribution that cover the most common server features, such as HTTP, HTTPS, SSL, Logging, Annotations...etc. There are several module files included with the Jetty distribution that cover the most common server features, such as HTTP, HTTPS, SSL, Logging, Annotations...etc.
These module files should *only* be edited if you are making structural changes to the way the feature will perform. These module files should *only* be edited if you are making structural changes to the way the feature will perform.
For more information, refer to the section on <<startup-modules,managing startup modules>> later in this chapter. For more information, refer to the section on link:#startup-modules[managing startup modules] later in this chapter.
XML Files:: XML Files::
XML files in either Jetty IoC or Spring format instantiate the actual POJO components of the server. XML files in either Jetty IoC or Spring format instantiate the actual POJO components of the server.
This includes all major components such as connectors, keystores, session managers, and data sources. This includes all major components such as connectors, keystores, session managers, and data sources.

2
jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc
View File

@ -137,7 +137,7 @@ jetty-distribution-{VERSION}/
It might seem strange or undesirable to unpack the first portion of the jetty-distribution directory name too. It might seem strange or undesirable to unpack the first portion of the jetty-distribution directory name too.
But starting with Jetty 9 the split between `${jetty.home}` and `${jetty.base}` allows for easier upgrades of Jetty itself while isolating your webapp specific configuration. But starting with Jetty 9 the split between `${jetty.home}` and `${jetty.base}` allows for easier upgrades of Jetty itself while isolating your webapp specific configuration.
For more information on the Jetty home and base concepts see the section on managing a Jetty installation <<startup-base-and-home, earlier in this Chapter.>> For more information on the Jetty home and base concepts see the section on managing a Jetty installation link:#startup-base-and-home[earlier in this Chapter.]
The `/opt/jetty/temp` directory is created as a durable place for Jetty to use for temp and working directories. The `/opt/jetty/temp` directory is created as a durable place for Jetty to use for temp and working directories.
Many Unix systems will periodically clean out the /tmp directory, this behavior is undesired in a Servlet container and has been known to cause problems. Many Unix systems will periodically clean out the /tmp directory, this behavior is undesired in a Servlet container and has been known to cause problems.