From cdb4ae10126e5e09b205c1fae7ad4ba6cec9a8db Mon Sep 17 00:00:00 2001 From: WalkerWatch Date: Thu, 29 Mar 2018 00:11:45 -0400 Subject: [PATCH] Added note about javax.mail not being included in Distribution in Jetty 10. Fixed broken links. Resolves #1597 --- .../jndi/jndi-configuration.adoc | 7 +++- .../asciidoc/reference/upgrading/chapter.adoc | 2 +- .../upgrading/upgrading-from-jetty-9.adoc | 37 +++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-from-jetty-9.adoc 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 0871ea53f69..e2cc6e8cb9e 100644 --- a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc @@ -193,7 +193,7 @@ The entry in `web.xml` would be: ---- -TODO: put in an example of a QUEUE from progress demo +//TODO: put in an example of a QUEUE from progress demo [[configuring-mail-with-jndi]] ==== Configuring Mail @@ -226,6 +226,11 @@ Jetty also provides infrastructure for access to `javax.mail.Sessions` from with This setup creates an instance of the `org.eclipse.jetty.jndi.factories.MailSessionReference` class, calls it's setter methods to set up the authentication for the mail system, and populates a set of Properties, setting them on the `MailSessionReference` instance. The result is that an application can look up `java:comp/env/mail/Session` at runtime and obtain access to a `javax.mail.Session` that has the necessary configuration to permit it to send email via SMTP. +____ +[NOTE] +As of Jetty 10, the link:{MVNCENTRAL}/org/eclipse/jetty/orbit/javax.mail.glassfish/1.4.1.v201005082020/javax.mail.glassfish-1.4.1.v201005082020.jar[`javax.mail`] and link:{MVNCENTRAL}/org/eclipse/jetty/orbit/javax.activation/1.1.0.v201105071233/javax.activation-1.1.0.v201105071233.jar[`javax.activation`] jar files are not included in the Jetty Distribution and will need to be downloaded separately from Maven Central. +____ + ____ [TIP] You can set the password to be plain text, or use Jetty's link:#configuring-security-secure-passwords[Secure Password Obfuscation] (OBF:) mechanism to make the config file a little more secure from prying eyes. diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc index 99ece4508ec..eed1b5f9470 100644 --- a/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc @@ -19,4 +19,4 @@ [[upgrading-jetty]] == Upgrading Jetty -include::upgrading-9.3-to-9.4.adoc[] +include::upgrading-from-jetty-9.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-from-jetty-9.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-from-jetty-9.adoc new file mode 100644 index 00000000000..2a2b53aa21b --- /dev/null +++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-from-jetty-9.adoc @@ -0,0 +1,37 @@ +// +// ======================================================================== +// 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. +// ======================================================================== +// + +=== Upgrading from Jetty 9.x to Jetty 10.0.x + +The purpose of this guide is to assist users migrating from Jetty 9 to 10. +It is not comprehensive, but covers many of the major changes included in the release that may prove as problem areas for users. + +//TODO - Make note of any specific required Java versions. + +==== Changes to Websocket + +==== `javax.mail` and `javax.transaction` + +Both `javax.mail` and `javax.transaction` have been removed from the Jetty Distribution in Jetty 10. +If you require these jars, you will need to enable the `ext` link:#startup-modules[module] and copy the files to your `$JETTY_BASE/lib/ext` directory. + +==== Removed Classes + +//TODO - Insert major removed/refactored classes from Jetty-9.x.x to Jetty-10.0.x + +==== Module Changes in Jetty 10.0