Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #5739 Remove distribution from doco #5740

Merged
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -34,7 +34,7 @@ To build, use:
mvn clean install
```

The Jetty distribution will be built in `jetty-distribution/target/distribution`.
Eclipse Jetty will be built in `jetty-home/target/jetty-home`.

The first build may take a longer than expected as Maven downloads all the dependencies.

Expand Down
Expand Up @@ -42,7 +42,7 @@ public class OneWebAppTest extends AbstractEmbeddedTest
@BeforeEach
public void startServer() throws Exception
{
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found");
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found");

server = OneWebApp.createServer(0);
server.start();
Expand Down
Expand Up @@ -42,7 +42,7 @@ public class OneWebAppWithJspTest extends AbstractEmbeddedTest
@BeforeEach
public void startServer() throws Exception
{
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found");
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found");

server = OneWebAppWithJsp.createServer(0);
server.start();
Expand Down
Expand Up @@ -41,7 +41,7 @@ public class ServerWithAnnotationsTest extends AbstractEmbeddedTest
@BeforeEach
public void startServer() throws Exception
{
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found");
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found");

server = ServerWithAnnotations.createServer(0);
server.start();
Expand Down
Expand Up @@ -42,7 +42,7 @@ public class ServerWithJNDITest extends AbstractEmbeddedTest
@BeforeEach
public void startServer() throws Exception
{
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found");
assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found");

server = ServerWithJNDI.createServer(0);
server.start();
Expand Down
2 changes: 1 addition & 1 deletion jetty-ant/src/test/config/build.xml
@@ -1,7 +1,7 @@
<!-- =======================================================================================-->
<!-- Build file for running the test-jetty-webapp from the jetty distro. -->
<!-- -->
<!-- You will need to have a full jetty-distribution available unpacked on your local file -->
<!-- You will need to have a full jetty-home available unpacked on your local file -->
<!-- system. We will refer to the top level directory of this distribution as $JETTY_HOME. -->
<!-- -->
<!-- To use: -->
Expand Down
Expand Up @@ -216,8 +216,8 @@ At this point the server has been configured with connectors for both HTTP and H
2017-08-31 10:19:58.855:INFO::main: Logging initialized @372ms to org.eclipse.jetty.util.log.StdErrLog
2017-08-31 10:19:59.076:INFO:oejs.Server:main: jetty-{VERSION}
2017-08-31 10:19:59.125:INFO:oejs.AbstractConnector:main: Started ServerConnector@421e98e0{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
2017-08-31 10:19:59.150:INFO:oejus.SslContextFactory:main: x509=X509@5315b42e(jetty,h=[jetty.eclipse.org],w=[]) for SslContextFactory@2ef9b8bc(file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore,file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore)
2017-08-31 10:19:59.151:INFO:oejus.SslContextFactory:main: x509=X509@5d624da6(mykey,h=[],w=[]) for SslContextFactory@2ef9b8bc(file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore,file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore)
2017-08-31 10:19:59.150:INFO:oejus.SslContextFactory:main: x509=X509@5315b42e(jetty,h=[jetty.eclipse.org],w=[]) for SslContextFactory@2ef9b8bc(file:///var/my-jetty-base/etc/keystore,file:///var/my-jetty-base/etc/keystore)
2017-08-31 10:19:59.151:INFO:oejus.SslContextFactory:main: x509=X509@5d624da6(mykey,h=[],w=[]) for SslContextFactory@2ef9b8bc(file:///var/my-jetty-base/etc/keystore,file:///var/my-jetty-base/etc/keystore)
2017-08-31 10:19:59.273:INFO:oejs.AbstractConnector:main: Started ServerConnector@2b98378d{SSL,[ssl, http/1.1]}{0.0.0.0:8443}
2017-08-31 10:19:59.274:INFO:oejs.Server:main: Started @791ms
....
Expand Down
Expand Up @@ -26,7 +26,7 @@ To test a Jetty release, complete the following steps for each release you want
[source, screen, subs="{sub-order}"]
....

wget https://oss.sonatype.org/content/repositories/jetty-[reponumber]/org/eclipse/jetty/jetty-distribution/[jetty-version]/jetty-distribution-9.[jetty-minor-version].tar.gz
wget https://oss.sonatype.org/content/repositories/jetty-[reponumber]/org/eclipse/jetty/jetty-home/[jetty-version]/jetty-home-9.[jetty-minor-version].tar.gz


....
Expand Down Expand Up @@ -200,12 +200,12 @@ Thread Pool - Concurrent Threads max = 239 | Queue Size max = 1002 | Queue Laten


....
7. Deploy `cometd.war` to the `webapps` directory of the jetty-distribution tested above.
7. Deploy `cometd.war` to the `webapps` directory of the jetty-home tested above.
+
[source, screen, subs="{sub-order}"]
....

cp cometd-demo/target/cometd-demo-[version].war [pathToJetty]/jetty-distribution-[jetty-version]/webapps/
cp cometd-demo/target/cometd-demo-[version].war [pathToJetty]/jetty-home-[jetty-version]/webapps/


....
Expand Down
Expand Up @@ -36,7 +36,7 @@ image:debug-eclipse-1.png[image,width=576]
+
image:debug-eclipse-2.png[image,width=576]

3. Accessing that servlet within your browser, pointed at your remote debug configurated jetty-distribution, should transition your Eclipse instance to the standard Debug view.
3. Accessing that servlet within your browser, pointed at your remote debug configurated jetty-home, should transition your Eclipse instance to the standard Debug view.
+
image:debug-eclipse-3.png[image,width=576]

Expand Down
Expand Up @@ -39,7 +39,7 @@ The red dot and red background on the line mark the breakpoint.
+
image:intellij_set_breakpoint.png[image,width=800]

3. Accessing that servlet within your browser, pointed at your remote debug configured jetty-distribution, should transition your IntelliJ instance to the standard debugger view.
3. Accessing that servlet within your browser, pointed at your remote debug configured jetty-home, should transition your IntelliJ instance to the standard debugger view.
+
image:intellij_debug_view.png[image,width=800]

Expand Down
Expand Up @@ -28,7 +28,7 @@ This is easily accomplished.

____
[NOTE]
This example assumes you are deploying your web application into the jetty-distribution.
This example assumes you are deploying your web application into a jetty-base.
____

===== Starting Jetty
Expand All @@ -47,7 +47,7 @@ $ java -Xdebug -agentlib:jdwp=transport=dt_socket,address=9999,server=y,suspend=
....

Via `start.ini`::
This approach is best used if you want to debug a particular jetty-distribution and not have to remember the commandline incantations.
This approach is best used if you want to debug a particular jetty-base and not have to remember the commandline incantations.
+
1. Edit the `start.ini` and uncomment the --exec line, this is required if you are adding jvm options to the start.ini file as jetty-start must generate the classpath required and fork a new jvm.
2. Add the parameters mentioned above in the Command Line option so your start.ini looks like this:
Expand Down Expand Up @@ -84,7 +84,7 @@ Via `start.ini`::
+
Uncomment any other jvm environmental options you so desire for your debugging session.

3. Regardless of the option chosen, you should see the following lines at the top of your jetty-distribution startup.
3. Regardless of the option chosen, you should see the following lines at the top of your jetty startup.
+
[source, plain, subs="{sub-order}"]
----
Expand Down
Expand Up @@ -48,7 +48,7 @@ Here's an example of the log output from Jetty when one of the sample Metro wars
[2093] java -jar start.jar

2013-07-26 15:47:53.480:INFO:oejs.Server:main: jetty-9.0.4.v20130625
2013-07-26 15:47:53.549:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/jetty-distribution-{VERSION}/webapps/] at interval 1
2013-07-26 15:47:53.549:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/jetty-home-{VERSION}/webapps/] at interval 1
Jul 26, 2013 3:47:53 PM com.sun.xml.ws.transport.http.servlet.WSServletContextListener contextInitialized
INFO: WSSERVLET12: JAX-WS context listener initializing
Jul 26, 2013 3:47:56 PM com.sun.xml.ws.server.MonitorBase createRoot
Expand Down
Expand Up @@ -147,7 +147,7 @@ etc/jetty.xml,etc/jetty-http.xml,etc/jetty-deployer.xml
Note that the paths can either be relative or absolute, or a mixture.
If the path is relative, it is resolved against either *jetty.home* or **jetty.home.bundle**, whichever was specified.
You can use this ability to mix and match jetty configuration files to add functionality, such as adding in a https connector.
Here's an example of adding a HTTPS connector, using the relevant files from the jetty-distribution:
Here's an example of adding a HTTPS connector, using the relevant files from the jetty-home:
+
....
etc/jetty.xml, etc/jetty-http.xml, /opt/jetty/etc/jetty-ssl.xml, /opt/jetty/etc/jetty-https.xml, etc/jetty-deployer.xml
Expand Down
Expand Up @@ -28,7 +28,7 @@ https://www.eclipse.org/jetty/download.html
____

It is available in both zip and gzip formats; download the one most appropriate for your system.
When you download and unpack the binary, it is extracted into a directory called `jetty-distribution-VERSION.`
When you download and unpack the binary, it is extracted into a directory called `jetty-home-VERSION.`
Put this directory in a convenient location.
The rest of the instructions in this documentation refer to this location as either `$JETTY_HOME` or as `$(jetty.home).`

Expand Down
Expand Up @@ -490,5 +490,5 @@ After enabling `console-capture`, the output is as follows, which displays the l
....
[my-base]$ java -jar /path/to/jetty-home/start.jar
151 [main] INFO org.eclipse.jetty.util.log - Logging initialized @238ms to org.eclipse.jetty.util.log.Slf4jLog
196 [main] INFO org.eclipse.jetty.util.log - Console stderr/stdout captured to /installs/jetty-distribution/mybase/logs/2016_10_21.jetty.log
196 [main] INFO org.eclipse.jetty.util.log - Console stderr/stdout captured to /installs/my-jetty-base/logs/2016_10_21.jetty.log
....